Refactor test.dart.

tools/testing/dart/test_options.dart

 // Copyright (c) 2012, 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("test_options_parser");
 
 #import("dart:io");
 #import("dart:math");
 #import("drt_updater.dart");
 #import("test_suite.dart");
@@ skipping 398 matching lines @@
                                'opera'];
         break;
       case 'dartc':
         validRuntimes = const ['none'];
         break;
       case 'none':
       case 'dart2dart':
         validRuntimes = const ['vm', 'drt', 'dartium'];
         break;
     }
-    if (!Contains(config['runtime'], validRuntimes)) {
+    if (!validRuntimes.contains(config['runtime'])) {
       isValid = false;
       print("Warning: combination of ${config['compiler']} and "
           "${config['runtime']} is invalid. Skipping this combination.");
     }
     if ((config['runtime'] == 'ie9' || config['runtime'] == 'ie10') &&
         Platform.operatingSystem != 'windows') {
       isValid = false;
       print("Warning cannot run Internet Explorer on non-Windows operating"
           " system.");
     }
     if (config['shard'] < 1 || config['shard'] > config['shards']) {
       isValid = false;
       print("Error: shard index is ${config['shard']} out of "
             "${config['shards']} shards");
     }
     if (config['runtime'] == 'dartium' &&
-        Contains(config['compiler'], const ['none', 'dart2dart']) &&
+        const ['none', 'dart2dart'].contains(config['compiler']) &&
         config['checked']) {
       // TODO(vsm): Set the DART_FLAGS environment appropriately when
       // invoking Selenium to support checked mode.  It's not clear
       // the current selenium API supports this.
       isValid = false;
       print("Warning: checked mode is not yet supported for dartium tests.");
     }
     return isValid;
   }
 
@@ skipping 115 matching lines @@
           timeout = 60;
           if (configuration['mode'] == 'debug') {
             timeout *= 8;
           }
           if (configuration['host_checked']) {
             timeout *= 16;
           }
           if (configuration['checked']) {
             timeout *= 2;
           }
-          if (Contains(configuration['runtime'],
-                       const ['ie9', 'ie10', 'ff', 'chrome', 'safari',
-                              'opera'])) {
+
+          const BROWSERS = const [
+            'ie9', 'ie10', 'ff', 'chrome', 'safari', 'opera'
+          ];
+
+          if (BROWSERS.contains(configuration['runtime'])) {
             timeout *= 8; // Allow additional time for browser testing to run.
           }
           break;
         default:
           if (configuration['mode'] == 'debug') {
             timeout *= 2;
           }
-          if (Contains(configuration['runtime'], const ['drt', 'dartium'])) {
+          if (const ['drt', 'dartium'].contains(configuration['runtime'])) {
             timeout *= 4; // Allow additional time for browser testing to run.
           }
           break;
       }
       configuration['timeout'] = timeout;
     }
 
     return [configuration];
   }
 
@@ skipping 65 matching lines @@
         return option;
       }
     }
     print('Unknown test option $name');
     exit(1);
   }
 
 
   List<_TestOptionSpecification> _options;
 }