New method-level granularity and output streaming for vogar.

1 files changed, 4 insertions, 5 deletions

diff --git a/tools/runner/java/vogar/JavaVm.java b/tools/runner/java/vogar/JavaVm.java
index e6dc684402..9c4e175cd5 100644
--- a/tools/runner/java/vogar/JavaVm.java
+++ b/tools/runner/java/vogar/JavaVm.java
@@ -17,7 +17,6 @@
 package vogar;
 
 import java.io.File;
-import java.io.PrintStream;
 import java.util.List;
 
 /**
@@ -27,11 +26,11 @@ final class JavaVm extends Vm {
 
     private final File javaHome;
 
-    JavaVm(Integer debugPort, long timeoutSeconds, File sdkJar, List<String> javacArgs,
-           PrintStream tee, File localTemp, File javaHome, List<String> additionalVmArgs,
-           boolean cleanBefore, boolean cleanAfter) {
+    JavaVm(Integer debugPort, File sdkJar, List<String> javacArgs, int monitorPort,
+            File localTemp, File javaHome, List<String> additionalVmArgs,
+            boolean cleanBefore, boolean cleanAfter) {
         super(new EnvironmentHost(cleanBefore, cleanAfter, debugPort, localTemp),
-              timeoutSeconds, sdkJar, javacArgs, tee, additionalVmArgs);
+                sdkJar, javacArgs, additionalVmArgs, monitorPort);
         this.javaHome = javaHome;
     }