Switch from DRT to content shell.

tools/testing/dart/test_runner.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 executing tests.
  *
  * This module includes:
  * - Managing parallel execution of tests, including timeout checks.
  * - Evaluating the output of each test as pass/fail/crash/timeout.
@@ skipping 162 matching lines @@
             }
           }
           return true;
         }
       }
       return false;
     });
   }
 }
 
-class DumpRenderTreeCommand extends Command {
+class ContentShellCommand extends Command {
   /**
-   * If [expectedOutputPath] is set, the output of DumpRenderTree is compared
+   * If [expectedOutputPath] is set, the output of content shell is compared
    * with the content of [expectedOutputPath].
    * This is used for example for pixel tests, where [expectedOutputPath] points
    * to a *png file.
    */
   io.Path expectedOutputPath;
 
-  DumpRenderTreeCommand(String executable,
-                        String htmlFile,
-                        List<String> options,
-                        List<String> dartFlags,
-                        io.Path this.expectedOutputPath)
+  ContentShellCommand(String executable,
+                      String htmlFile,
+                      List<String> options,
+                      List<String> dartFlags,
+                      io.Path this.expectedOutputPath)
       : super(executable,
               _getArguments(options, htmlFile),
               _getEnvironment(dartFlags));
 
   static Map _getEnvironment(List<String> dartFlags) {
     var needDartFlags = dartFlags != null && dartFlags.length > 0;
 
     var env = null;
     if (needDartFlags) {
       env = new Map.from(io.Platform.environment);
@@ skipping 431 matching lines @@
           stderr,
           time,
           compilationSkipped);
 
   bool get didFail {
     if (_failedBecauseOfMissingXDisplay) {
       return true;
     }
 
     if (command.expectedOutputFile != null) {
-      // We are either doing a pixel test or a layout test with DumpRenderTree
+      // We are either doing a pixel test or a layout test with content shell
       return _failedBecauseOfUnexpectedDRTOutput;
     }
     return _browserTestFailure;
   }
 
   bool get _failedBecauseOfMissingXDisplay {
     // Browser case:
-    // If the browser test failed, it may have been because DumpRenderTree
-    // and the virtual framebuffer X server didn't hook up, or DRT crashed with
-    // a core dump. Sometimes DRT crashes after it has set the stdout to PASS,
-    // so we have to do this check first.
+    // If the browser test failed, it may have been because content shell
+    // and the virtual framebuffer X server didn't hook up, or it crashed with
+    // a core dump. Sometimes content shell crashes after it has set the stdout
+    // to PASS, so we have to do this check first.
     var stderrLines = decodeUtf8(super.stderr).split("\n");
     for (String line in stderrLines) {
       // TODO(kustermann,ricow): Issue: 7564
       // This seems to happen quite frequently, we need to figure out why.
       if (line.contains('Gtk-WARNING **: cannot open display') ||
           line.contains('Failed to run command. return code=1')) {
         // If we get the X server error, or DRT crashes with a core dump, retry
         // the test.
         if ((testCase as BrowserTestCase).numRetries > 0) {
           requestRetry = true;
         }
         print("Warning: Test failure because of missing XDisplay");
         return true;
       }
     }
     return false;
   }
 
   bool get _failedBecauseOfUnexpectedDRTOutput {
     /*
-     * The output of DumpRenderTree is different for pixel tests than for
+     * The output of content shell is different for pixel tests than for
      * layout tests.
      *
      * On a pixel test, the DRT output has the following format
      *     ......
      *     ......
      *     Content-Length: ...\n
      *     <*png data>
      *     #EOF\n
      * So we need to get the byte-range of the png data first, before
      * comparing it with the content of the expected output file.
@@ skipping 1168 matching lines @@
     }
   }
 
   void eventAllTestsDone() {
     for (var listener in _eventListener) {
       listener.allDone();
     }
   }
 }