Add support for chrome on windows to the new browser controller

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:convert" show LineSplitter, UTF8;
 import "dart:core";
 import "dart:io";
 
@@ skipping 299 matching lines @@
   String toString() => "Safari";
 
   // Delete the user specific browser cache and profile data.
   // Safari only have one per user, and you can't specify one by command line.
   static bool deleteCache = false;
 
 }
 
 
 class Chrome extends Browser {
-  /**
-   * The binary used to run chrome - changing this can be nececcary for
-   * testing or using non standard chrome installation.
-   */
-  static const String binary = "google-chrome";
+  static String _binary = _getBinary();
+
+  // This is extracted to a function since we may need to support several
+  // locations.
+  static String _getWindowsBinary() {
+    return "C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe";
+  }
+
+  static String _getBinary() {
+    if (Platform.isWindows) return _getWindowsBinary();
+    if (Platform.isLinux) return 'google-chrome';

[kustermann, 2013/09/06 09:24:55]

Please add the path for mac as well.

[ricow1, 2013/09/06 09:40:21]

Done.

+  }
 
   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) {
+    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);
       }
       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);
+        return startBrowser(_binary, args);
 
       });
     }).catchError((e) {
       _logEvent("Running $binary --version failed with $e");
       return false;
     });
   }
 
   String toString() => "Chrome";
 }
@@ skipping 123 matching lines @@
   // locations.
   static String _getWindowsBinary() {
     return "C:\\Program Files (x86)\\Mozilla Firefox\\firefox.exe";
   }
 
   static String _getBinary() {
     if (Platform.isWindows) return _getWindowsBinary();
     if (Platform.isLinux) return 'firefox';
   }
 
-
   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);
       }
       version = versionResult.stdout;
@@ skipping 646 matching lines @@
     Dart test driver, number of tests: <div id="number"></div><br>
     Currently executing: <div id="currently_executing"></div><br>
     Unhandled error: <div id="unhandled_error"></div>
     <iframe id="embedded_iframe"></iframe>
   </body>
 </html>
 """;
     return driverContent;
   }
 }