Switch from DRT to content shell.

tools/testing/dart/test_suite.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.
 
 /**
  * Classes and methods for enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 499 matching lines @@
             enqueueTestCaseFromTestInformation(info);
           }
         });
       }
     }).then((_) {
       if (onDone != null) onDone();
     });
   }
 
   /**
-   * If DumpRenderTree/Dartium is required, and not yet updated, waits for
+   * If Content shell/Dartium is required, and not yet updated, waits for
    * the update then completes. Otherwise completes immediately.
    */
   Future updateDartium() {
     var completer = new Completer();
     var updater = runtimeUpdater(configuration);
     if (updater == null || updater.updated) {
       return new Future.immediate(null);
     }
 
     assert(updater.isActive);
@@ skipping 480 matching lines @@
             args.add('--force-refresh');
           }
           commandSet.add(new Command('python', args));
         } else {
           if (runtime != "drt") {
             print("Unknown runtime $runtime");
             exit(1);
           }
 
           var dartFlags = [];
-          var dumpRenderTreeOptions = [];
+          var contentShellOptions = [];
 
-          dumpRenderTreeOptions.add('--no-timeout');
+          contentShellOptions.add('--no-timeout');
+          contentShellOptions.add('--dump-render-tree');
 
           if (compiler == 'none' || compiler == 'dart2dart') {
             dartFlags.add('--ignore-unrecognized-flags');
             if (configuration["checked"]) {
               dartFlags.add('--enable_asserts');
               dartFlags.add("--enable_type_checks");
             }
             dartFlags.addAll(vmOptions);
           }
 
           if (expectedOutput != null) {
             if (expectedOutput.toNativePath().endsWith('.png')) {
               // pixel tests are specified by running DRT "foo.html'-p"
-              dumpRenderTreeOptions.add('--notree');
+              contentShellOptions.add('--notree');
               fullHtmlPath = "${fullHtmlPath}'-p";
             }
           }
-          commandSet.add(new DumpRenderTreeCommand(dumpRenderTreeFilename,
-                                                   fullHtmlPath,
-                                                   dumpRenderTreeOptions,
-                                                   dartFlags,
-                                                   expectedOutput));
+          commandSet.add(new ContentShellCommand(contentShellFilename,
+                                                 fullHtmlPath,
+                                                 contentShellOptions,
+                                                 dartFlags,
+                                                 expectedOutput));
         }
 
         // Create BrowserTestCase and queue it.
         String testDisplayName = '$suiteName/$testName';
         var testCase;
         if (info.optionsFromFile['isMultiHtmlTest']) {
           testDisplayName = '$testDisplayName/${subtestNames[subtestIndex]}';
           testCase = new BrowserTestCase(testDisplayName,
               commandSet, configuration, completeHandler,
               expectations['$testName/${subtestNames[subtestIndex]}'],
@@ skipping 109 matching lines @@
 
   bool get hasRuntime {
     switch(configuration['runtime']) {
       case 'none':
         return false;
       default:
         return true;
     }
   }
 
-  String get dumpRenderTreeFilename {
+  String get contentShellFilename {
     if (configuration['drt'] != '') {
       return configuration['drt'];
     }
     if (Platform.operatingSystem == 'macos') {
-      return dartDir.append('/client/tests/drt/DumpRenderTree.app/Contents/'
-                            'MacOS/DumpRenderTree').toNativePath();
+      return dartDir.append('/client/tests/drt/Content Shell.app/Contents/'
+                            'MacOS/Content Shell').toNativePath();
     }
-    return dartDir.append('client/tests/drt/DumpRenderTree').toNativePath();
+    return dartDir.append('client/tests/drt/content_shell').toNativePath();
   }
 
   String get dartiumFilename {
     if (configuration['dartium'] != '') {
       return configuration['dartium'];
     }
     if (Platform.operatingSystem == 'macos') {
       return dartDir.append('client/tests/dartium/Chromium.app/Contents/'
                             'MacOS/Chromium').toNativePath();
     }
@@ skipping 735 matching lines @@
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout
  * $compileErrorSkip tests are skipped on browsers due to compile-time error
 """;
     print(report);
    }
 }