Revert 24086 Update checked in binary to version 0.5.19.0

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';
@@ skipping 216 matching lines @@
         if (line.contains("CFBundleShortVersionString")) {
           versionOnNextLine = true;
         }
       }
       return null;
     });
   }
 
   void _createLaunchHTML(var path, var url) {
     var file = new File("${path}/launch.html");
-    var randomFile = file.openSync(mode: FileMode.WRITE);
+    var randomFile = file.openSync(FileMode.WRITE);
     var content = '<script language="JavaScript">location = "$url"</script>';
     randomFile.writeStringSync(content);
     randomFile.close();
   }
 
   Future<bool> start(String url) {
     _logEvent("Starting Safari browser on: $url");
     // Get the version and log that.
     return allowPopUps().then((success) {
       if (!success) {
-        return new Future.value(false);
+        return new Future.immediate(false);
       }
       return getVersion().then((version) {
         _logEvent("Got version: $version");
         var args = ["'$url'"];
         return new Directory('').createTemp().then((userDir) {
           _cleanup = () { userDir.deleteSync(recursive: true); };
           _createLaunchHTML(userDir.path, url);
           var args = ["${userDir.path}/launch.html"];
           return startBrowser(binary, args);
         });
@@ skipping 15 matching lines @@
    */
   const String binary = "google-chrome";
 
   Future<bool> start(String url) {
     _logEvent("Starting chrome browser on: $url");
     // Get the version and log that.
     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.value(false);
+        return new Future.immediate(false);
       }
       version = versionResult.stdout;
       _logEvent("Got version: $version");
 
       return new Directory('').createTemp().then((userDir) {
         _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);
@@ skipping 61 matching lines @@
       return _adbDevice.startActivity(chromeIntent).then((_) => true);
     });
   }
 
   Future<bool> close() {
     if (_adbDevice != null) {
       return _adbDevice.forceStop(chromePackage).then((_) {
         return _adbDevice.killAll().then((_) => true);
       });
     }
-    return new Future.value(true);
+    return new Future.immediate(true);
   }
 
   String toString() => "chromeOnAndroid";
 }
 
 class Firefox extends Browser {
   /**
    * The binary used to run firefox - changing this can be nececcary for
    * testing or using non standard firefox installation.
    */
   const String binary = "firefox";
 
   const String enablePopUp =
       'user_pref("dom.disable_open_during_load", false);';
   const String disableDefaultCheck =
       'user_pref("browser.shell.checkDefaultBrowser", false);';
 
   Future _createPreferenceFile(var path) {
     var file = new File("${path.toString()}/user.js");
-    var randomFile = file.openSync(mode: FileMode.WRITE);
+    var randomFile = file.openSync(FileMode.WRITE);
     randomFile.writeStringSync(enablePopUp);
     randomFile.writeStringSync(disableDefaultCheck);
     randomFile.close();
   }
 
 
   Future<bool> start(String url) {
     _logEvent("Starting firefox browser on: $url");
     // Get the version and log that.
     return Process.run(binary, ["--version"]).then((var versionResult) {
       if (versionResult.exitCode != 0) {
         _logEvent("Failed to firefox get version");
         _logEvent("Make sure $binary is a valid program for running firefox");
-        return new Future.value(false);
+        return new Future.immediate(false);
       }
       version = versionResult.stdout;
       _logEvent("Got version: $version");
 
       return new Directory('').createTemp().then((userDir) {
         _createPreferenceFile(userDir.path);
         _cleanup = () { userDir.deleteSync(recursive: true); };
         var args = ["-profile", "${userDir.path}",
                     "-no-remote", "-new-instance", url];
         return startBrowser(binary, args);
@@ skipping 344 matching lines @@
 
   BrowserTestingServer(this.local_ip, this.useIframe);
 
   Future start() {
     return HttpServer.bind(local_ip, 0).then((createdServer) {
       httpServer = createdServer;
       void handler(HttpRequest request) {
         DebugLogger.info("Handling request to: ${request.uri.path}");
         if (request.uri.path.startsWith(reportPath)) {
           var browserId = request.uri.path.substring(reportPath.length + 1);
-          var testId = 
-              int.parse(request.uri.queryParameters["id"].split("=")[1]);
+          var testId = int.parse(request.queryParameters["id"].split("=")[1]);
+
           handleReport(request, browserId, testId);
           // handleReport will asynchroniously fetch the data and will handle
           // the closing of the streams.
           return;
         }
         var textResponse = "";
         if (request.uri.path.startsWith(driverPath)) {
           var browserId = request.uri.path.substring(driverPath.length + 1);
           textResponse = getDriverPage(browserId);
         } else if (request.uri.path.startsWith(nextTestPath)) {
@@ skipping 110 matching lines @@
 
       function newTaskHandler() {
         if (this.readyState == this.DONE) {
           if (this.status == 200) {
             if (this.responseText == '$waitSignal') {
               setTimeout(getNextTask, 500);
             } else if (this.responseText == '$terminateSignal') {
               // Don't do anything, we will be killed shortly.
             } else {
               var elapsed = new Date() - start;
+              reportError('Done getting task at: ' + elapsed);
               // TODO(ricow): Do something more clever here.
               if (nextTask != undefined) alert('This is really bad');
               // The task is send to us as:
               // URL#ID
               var split = this.responseText.split('#');
               var nextTask = split[0];
               current_id = split[1];
-              reportError('Done getting task : ' + elapsed);
               did_start = false;
               run(nextTask);
             }
           } else {
             reportError('Could not contact the server and get a new task');
           }
         }
       }
 
       function getNextTask() {
@@ skipping 92 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;
   }
 }