Tighten types in test.dart even more.

tools/testing/dart/compiler_configuration.dart

 // Copyright (c) 2014, 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 compiler_configuration;
 
 import 'dart:io' show Platform;
 
 import 'runtime_configuration.dart' show RuntimeConfiguration;
 import 'runtime_configuration.dart' show DartPrecompiledAdbRuntimeConfiguration;
@@ skipping 38 matching lines @@
 
   /// Only some subclasses support this check, but we statically allow calling
   /// it on [CompilerConfiguration].
   bool get useDfe {
     throw new UnsupportedError("This compiler does not support DFE.");
   }
 
   // TODO(ahe): Remove this constructor and move the switch to
   // test_options.dart.  We probably want to store an instance of
   // [CompilerConfiguration] in [configuration] there.
-  factory CompilerConfiguration(Map configuration) {
-    String compiler = configuration['compiler'];
+  factory CompilerConfiguration(Map<String, dynamic> configuration) {
+    var compiler = configuration['compiler'] as String;
 
     // TODO(ahe): Move these booleans into a struction configuration object
     // which can eventually completely replace the Map-based configuration
     // object.
-    bool isDebug = configuration['mode'] == 'debug';
-    bool isChecked = configuration['checked'];
-    bool isStrong = configuration['strong'];
-    bool isHostChecked = configuration['host_checked'];
-    bool useSdk = configuration['use_sdk'];
-    bool isCsp = configuration['csp'];
-    bool useBlobs = configuration['use_blobs'];
-    bool hotReload = configuration['hot_reload'];
-    bool hotReloadRollback = configuration['hot_reload_rollback'];
-    bool useFastStartup = configuration['fast_startup'];
-    bool useKernelInDart2js = configuration['dart2js_with_kernel'];
+    var isDebug = (configuration['mode'] as String) == 'debug';
+    var isChecked = configuration['checked'] as bool;
+    var isStrong = configuration['strong'] as bool;
+    var isHostChecked = configuration['host_checked'] as bool;
+    var useSdk = configuration['use_sdk'] as bool;
+    var isCsp = configuration['csp'] as bool;
+    var useBlobs = configuration['use_blobs'] as bool;
+    var hotReload = configuration['hot_reload'] as bool;
+    var hotReloadRollback = configuration['hot_reload_rollback'] as bool;
+    var useFastStartup = configuration['fast_startup'] as bool;
+    var useKernelInDart2js = configuration['dart2js_with_kernel'] as bool;
 
     switch (compiler) {
       case 'dart2analyzer':
         return new AnalyzerCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
             isStrong: isStrong,
             isHostChecked: isHostChecked,
             useSdk: useSdk);
       case 'dart2js':
         return new Dart2jsCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
             isHostChecked: isHostChecked,
             useSdk: useSdk,
             isCsp: isCsp,
             useFastStartup: useFastStartup,
             useKernel: useKernelInDart2js,
             extraDart2jsOptions:
                 TestUtils.getExtraOptions(configuration, 'dart2js_options'));
       case 'app_jit':
         return new AppJitCompilerConfiguration(
             isDebug: isDebug, isChecked: isChecked);
       case 'precompiler':
         return new PrecompilerCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
-            arch: configuration['arch'],
+            arch: configuration['arch'] as String,
             useBlobs: useBlobs,
             isAndroid: configuration['system'] == 'android');
       case 'dartk':
         return new NoneCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
             isHostChecked: isHostChecked,
             useSdk: useSdk,
             hotReload: hotReload,
             hotReloadRollback: hotReloadRollback,
             useDfe: true);
       case 'dartkp':
         return new PrecompilerCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
-            arch: configuration['arch'],
+            arch: configuration['arch'] as String,
             useBlobs: useBlobs,
             isAndroid: configuration['system'] == 'android',
             useDfe: true);
       case 'none':
         return new NoneCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
             isHostChecked: isHostChecked,
             useSdk: useSdk,
             hotReload: hotReload,
@@ skipping 826 matching lines @@
       RuntimeConfiguration runtimeConfiguration,
       String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
       CommandArtifact artifact) {
     return <String>[];
   }
 }