Fixed bug in browser_controller.dart

tools/testing/dart/browser_controller.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 library browser;
 
 import "dart:async";
 import "dart:core";
 import "dart:io";
 
 import 'android.dart';
 import 'utils.dart';
 
 /** Class describing the interface for communicating with browsers. */
 abstract class Browser {
   StringBuffer _stdout = new StringBuffer();
   StringBuffer _stderr = new StringBuffer();
   StringBuffer _usageLog = new StringBuffer();
   // This function is called when the process is closed.
-  // This is extracted to an external function so that we can do additional
-  // functionality when the process closes (cleanup and call onExit)
-  Function _processClosed;
-  // This is called after the process is closed, after _processClosed has
-  // been called, but before onExit. Subclasses can use this to cleanup
+  Completer _processClosedCompleter = new Completer();
+  // This is called after the process is closed, after _processClosedCompleter
+  // has been called, but before onExit. Subclasses can use this to cleanup
   // any browser specific resources (temp directories, profiles, etc)
+  // The function is expected to do it's work synchronously.
   Function _cleanup;
 
   /** The version of the browser - normally set when starting a browser */
   String version = "";
   /**
    * The underlying process - don't mess directly with this if you don't
    * know what you are doing (this is an interactive process that needs
    * special threatment to not leak).
    */
   Process process;
 
   Function logger;
 
   /**
    * Id of the browser
    */
   String id;
 
-  /** Callback that will be executed when the browser has closed */
-  Function onClose;
-
   /** Print everything (stdout, stderr, usageLog) whenever we add to it */
   bool debugPrint = false;
 
   // This future will be lazily set when calling close() and will complete once
   // the process did exit.
   Future browserTerminationFuture;
 
   Browser();
 
   factory Browser.byName(String name) {
@@ skipping 36 matching lines @@
     _stderr.write(output);
   }
 
   Future close() {
     _logEvent("Close called on browser");
     if (browserTerminationFuture == null) {
       var completer = new Completer();
       browserTerminationFuture = completer.future;
 
       if (process != null) {
-        // Make sure we intercept onExit calls and complete.
-        _processClosed = () {
-          _processClosed = null;
+        _processClosedCompleter.future.then((_) {
           process = null;
           completer.complete(true);
-        };
+          if (_cleanup != null) {
+            _cleanup();
+          }
+        });
 
         if (process.kill(ProcessSignal.SIGKILL)) {
           _logEvent("Successfully sent kill signal to process.");
         } else {
           _logEvent("Sending kill signal failed.");
         }
       } else {
         _logEvent("The process is already dead.");
         completer.complete(true);
       }
@@ skipping 27 matching lines @@
         // This should _never_ happen, but we really want this in the log
         // if it actually does due to dart:io or vm bug.
         _logEvent("An error occured in the process stderr handling: $error");
       },  onDone: () {
         stderrDone.complete(true);
       });
 
       process.exitCode.then((exitCode) {
         _logEvent("Browser closed with exitcode $exitCode");
         Future.wait([stdoutDone.future, stderrDone.future]).then((_) {
-          if (_processClosed != null) _processClosed();
-          if (_cleanup != null) _cleanup();
-          if (onClose != null) onClose(exitCode);
+          _processClosedCompleter.complete(exitCode);
         });
       });
       return true;
     }).catchError((error) {
       _logEvent("Running $command $arguments failed with $error");
       return false;
     });
   }
 
   /**
@@ skipping 81 matching lines @@
     _logEvent("Starting Safari browser on: $url");
     // Get the version and log that.
     return allowPopUps().then((success) {
       if (!success) {
         return new Future.immediate(false);
       }
       return getVersion().then((version) {
         _logEvent("Got version: $version");
         var args = ["'$url'"];
         return new Directory('').createTemp().then((userDir) {
-          _cleanup = () { userDir.delete(recursive: true); };
+          _cleanup = () { userDir.deleteSync(recursive: true); };
           _createLaunchHTML(userDir.path, url);
           var args = ["${userDir.path}/launch.html"];
           return startBrowser(binary, args);
         });
       }).catchError((e) {
         _logEvent("Running $binary --version failed with $e");
         return false;
       });
     });
   }
@@ skipping 15 matching lines @@
     return Process.run(binary, ["--version"]).then((var versionResult) {
       if (versionResult.exitCode != 0) {
         _logEvent("Failed to chrome get version");
         _logEvent("Make sure $binary is a valid program for running chrome");
         return new Future.immediate(false);
       }
       version = versionResult.stdout;
       _logEvent("Got version: $version");
 
       return new Directory('').createTemp().then((userDir) {
-        _cleanup = () { userDir.delete(recursive: true); };
+        _cleanup = () { userDir.deleteSync(recursive: true); };
         var args = ["--user-data-dir=${userDir.path}", url,
                     "--disable-extensions", "--disable-popup-blocking",
                     "--bwsi", "--no-first-run"];
         return startBrowser(binary, args);
 
       });
     }).catchError((e) {
       _logEvent("Running $binary --version failed with $e");
       return false;
     });
@@ skipping 96 matching lines @@
       if (versionResult.exitCode != 0) {
         _logEvent("Failed to firefox get version");
         _logEvent("Make sure $binary is a valid program for running firefox");
         return new Future.immediate(false);
       }
       version = versionResult.stdout;
       _logEvent("Got version: $version");
 
       return new Directory('').createTemp().then((userDir) {
         _createPreferenceFile(userDir.path);
-        _cleanup = () { userDir.delete(recursive: true); };
+        _cleanup = () { userDir.deleteSync(recursive: true); };
         var args = ["-profile", "${userDir.path}",
                     "-no-remote", "-new-instance", url];
         return startBrowser(binary, args);
 
       });
     }).catchError((e) {
       _logEvent("Running $binary --version failed with $e");
       return false;
     });
   }
@@ skipping 510 matching lines @@
 </head>
   <body onload="startTesting()">
     Dart test driver, number of tests: <div id="number"></div>
     <iframe id="embedded_iframe"></iframe>
   </body>
 </html>
 """;
     return driverContent;
   }
 }