Tighten types in test.dart even more.

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 UTF8, JSON;
 import "dart:core";
 import "dart:io";
 import "dart:math" show min;
@@ skipping 450 matching lines @@
         }
         return exists;
       });
     }
     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 false;
       }
-      _version = versionResult.stdout;
+      _version = versionResult.stdout as String;
       return true;
     });
   }
 
   Future<bool> start(String url) {
     _logEvent("Starting chrome browser on: $url");
     // Get the version and log that.
-    return _getVersion().then((success) {
+    return _getVersion().then<bool>((success) {
       if (!success) return false;
       _logEvent("Got version: $_version");
 
       return Directory.systemTemp.createTemp().then((userDir) {
         _cleanup = () {
           try {
             userDir.deleteSync(recursive: true);
           } catch (e) {
             _logEvent(
                 "Error: failed to delete Chrome user-data-dir ${userDir.path}"
@@ skipping 118 matching lines @@
       "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Internet Explorer",
       "/v",
       "svcVersion"
     ];
     return Process.run("reg", args).then((result) {
       if (result.exitCode == 0) {
         // The string we get back looks like this:
         // HKEY_LOCAL_MACHINE\Software\Microsoft\Internet Explorer
         //    version    REG_SZ    9.0.8112.16421
         var findString = "REG_SZ";
-        var index = result.stdout.indexOf(findString);
+        var index = (result.stdout as String).indexOf(findString);
         if (index > 0) {
-          return result.stdout.substring(index + findString.length).trim();
+          return (result.stdout as String)
+              .substring(index + findString.length)
+              .trim();
         }
       }
       return "Could not get the version of internet explorer";
     });
   }
 
   // Clears the recovery cache if the static resetBrowserConfiguration flag is
   // set.
   Future<bool> resetConfiguration() {
     if (!Browser.resetBrowserConfiguration) return new Future.value(true);
@@ skipping 179 matching lines @@
 
   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;
+      version = versionResult.stdout as String;
       _logEvent("Got version: $version");
 
       return Directory.systemTemp.createTemp().then((userDir) {
         _createPreferenceFile(userDir.path);
         _cleanup = () {
           userDir.deleteSync(recursive: true);
         };
         var args = [
           "-profile",
           "${userDir.path}",
@@ skipping 105 matching lines @@
 /// driver page to the browsers, serves tests, and receives results and
 /// requests back from the browsers.
 class BrowserTestRunner {
   static const int MAX_NEXT_TEST_TIMEOUTS = 10;
   static const Duration NEXT_TEST_TIMEOUT = const Duration(seconds: 120);
   static const Duration RESTART_BROWSER_INTERVAL = const Duration(seconds: 60);
 
   /// If the queue was recently empty, don't start another browser.
   static const Duration MIN_NONEMPTY_QUEUE_TIME = const Duration(seconds: 1);
 
-  final Map<String, String> configuration;
+  final Map<String, dynamic> configuration;
   final BrowserTestingServer testingServer;
 
   final String localIp;
   final String browserName;
   int maxNumBrowsers;
   final bool checkedMode;
   int numBrowsers = 0;
   // Used to send back logs from the browser (start, stop etc)
   Function logger;
 
@@ skipping 32 matching lines @@
   // When no browser is currently starting, _currentStartingBrowserId is null.
   bool get aBrowserIsCurrentlyStarting => _currentStartingBrowserId != null;
   void markCurrentlyStarting(String id) {
     _currentStartingBrowserId = id;
   }
 
   void markNotCurrentlyStarting(String id) {
     if (_currentStartingBrowserId == id) _currentStartingBrowserId = null;
   }
 
-  BrowserTestRunner(Map configuration, String localIp, String browserName,
-      this.maxNumBrowsers)
+  BrowserTestRunner(Map<String, dynamic> configuration, String localIp,
+      String browserName, this.maxNumBrowsers)
       : configuration = configuration,
         localIp = localIp,
         browserName = (browserName == 'ff') ? 'firefox' : browserName,
-        checkedMode = configuration['checked'],
+        checkedMode = configuration['checked'] as bool,
         testingServer = new BrowserTestingServer(
             configuration,
             localIp,
             Browser.requiresIframe(browserName),
             Browser.requiresFocus(browserName)) {
     testingServer.testRunner = this;
   }
 
   Future start() async {
     await testingServer.start();
@@ skipping 358 matching lines @@
 
   TestChangedCallback testDoneCallBack;
   TestChangedCallback testStatusUpdateCallBack;
   TestChangedCallback testStartedCallBack;
   NextTestCallback nextTestCallBack;
 
   BrowserTestingServer(
       this.configuration, this.localIp, this.useIframe, this.requiresFocus);
 
   Future start() {
-    var testDriverErrorPort = configuration['test_driver_error_port'];
+    var testDriverErrorPort = configuration['test_driver_error_port'] as int;
     return HttpServer
         .bind(localIp, testDriverErrorPort)
         .then(setupErrorServer)
         .then(setupDispatchingServer);
   }
 
   void setupErrorServer(HttpServer server) {
     errorReportingServer = server;
     void errorReportingHandler(HttpRequest request) {
       StringBuffer buffer = new StringBuffer();
@@ skipping 15 matching lines @@
     }
 
     void errorHandler(e) {
       if (!underTermination) print("Error occured in httpserver: $e");
     }
 
     errorReportingServer.listen(errorReportingHandler, onError: errorHandler);
   }
 
   void setupDispatchingServer(_) {
-    DispatchingServer server = configuration['_servers_'].server;
+    var server = (configuration['_servers_'] as TestingServers).server;
     void noCache(HttpRequest request) {
       request.response.headers
           .set("Cache-Control", "no-cache, no-store, must-revalidate");
     }
 
     int testId(HttpRequest request) =>
         int.parse(request.uri.queryParameters["id"]);
     String browserId(HttpRequest request, String prefix) =>
         request.uri.path.substring(prefix.length + 1);
 
@@ skipping 95 matching lines @@
     return nextTest == null ? waitSignal : nextTest.toJSON();
   }
 
   String getDriverUrl(String browserId) {
     if (errorReportingServer == null) {
       print("Bad browser testing server, you are not started yet. Can't "
           "produce driver url");
       exit(1);
       // This should never happen - exit immediately;
     }
-    var port = configuration['_servers_'].port;
+    var port = (configuration['_servers_'] as TestingServers).port;
     return "http://$localIp:$port/driver/$browserId";
   }
 
   Future<String> getDriverPage(String browserId) async {
     await testRunner.browserStatus[browserId].browser.onDriverPageRequested();
     var errorReportingUrl =
         "http://$localIp:${errorReportingServer.port}/$browserId";
     String driverContent = """
 <!DOCTYPE html><html>
 <head>
@@ skipping 400 matching lines @@
           'exit code: ${result.exitCode}\n'
           'stdout: ${result.stdout}\n'
           'stderr: ${result.stderr}');
     } else {
       print('[$message] Successfully uploaded screenshot to $storageUrl');
     }
     new File(screenshotFile).deleteSync();
   }
   print('--------------------------------------------------------------------');
 }