Add content shell support.

test/runner/browser/content_shell_test.dart

Index: test/runner/browser/content_shell_test.dart
diff --git a/test/runner/browser/dartium_test.dart b/test/runner/browser/content_shell_test.dart
similarity index 77%
copy from test/runner/browser/dartium_test.dart
copy to test/runner/browser/content_shell_test.dart
index b83e42486b31c4f44f1b8624677faf315f0fc54e..6d19209864d2f6b6532dec8b58a2c0a6f7938899 100644
--- a/test/runner/browser/dartium_test.dart
+++ b/test/runner/browser/content_shell_test.dart
@@ -10,7 +10,7 @@ import 'dart:io';
 import 'package:shelf/shelf.dart' as shelf;
 import 'package:shelf/shelf_io.dart' as shelf_io;
 import 'package:shelf_web_socket/shelf_web_socket.dart';
-import 'package:test/src/runner/browser/dartium.dart';
+import 'package:test/src/runner/browser/content_shell.dart';
 import 'package:test/src/util/io.dart';
 import 'package:test/src/utils.dart';
 import 'package:test/test.dart';
@@ -34,9 +34,12 @@ void main() {
 """, headers: {'content-type': 'text/html'});
       } else if (path == "index.dart") {
         return new shelf.Response.ok('''
+import "dart:js" as js;
 import "dart:html";
 
 void main() {
+  js.context['testRunner'].callMethod('waitUntilDone', []);
+
   $dart
 }
 ''', headers: {'content-type': 'application/dart'});
@@ -68,18 +71,19 @@ void main() {
       webSockets = null;
     });
 
-    test("starts Dartium with the given URL", () {
+    test("starts content shell with the given URL", () {
       dart = '''
 var webSocket = new WebSocket(
     window.location.href.replaceFirst("http://", "ws://"));
 webSocket.onOpen.first.then((_) => webSocket.send("loaded!"));
 ''';
-      var dartium = new Dartium(baseUrlForAddress(server.address, server.port));
+      var contentShell = new ContentShell(
+          baseUrlForAddress(server.address, server.port));
 
       return webSockets.first.then((webSocket) {
         return webSocket.first.then(
             (message) => expect(message, equals("loaded!")));
-      }).whenComplete(dartium.close);
+      }).whenComplete(contentShell.close);
     });
 
     test("doesn't preserve state across runs", () {
@@ -90,16 +94,17 @@ var webSocket = new WebSocket(
     window.location.href.replaceFirst("http://", "ws://"));
 webSocket.onOpen.first.then((_) => webSocket.send("done"));
 ''';
-      var dartium = new Dartium(baseUrlForAddress(server.address, server.port));
+      var contentShell = new ContentShell(
+          baseUrlForAddress(server.address, server.port));
 
       var first = true;
       webSockets.listen(expectAsync((webSocket) {
         if (first) {
           // The first request will set local storage data. We can't kill the
-          // old Dartium and start a new one until we're sure that that has
-          // finished.
+          // old content shell and start a new one until we're sure that that
+          // has finished.
           webSocket.first.then((_) {
-            dartium.close();
+            contentShell.close();
 
             dart = '''
 var webSocket = new WebSocket(
@@ -107,7 +112,7 @@ var webSocket = new WebSocket(
 webSocket.onOpen.first.then((_) =>
     webSocket.send(window.localStorage["data"].toString()));
 ''';
-            dartium = new Dartium(
+            contentShell = new ContentShell(
                 baseUrlForAddress(server.address, server.port));
             first = false;
           });
@@ -117,7 +122,7 @@ webSocket.onOpen.first.then((_) =>
           expect(
               webSocket.first
                   .then((message) => expect(message, equals('null')))
-                  .whenComplete(dartium.close),
+                  .whenComplete(contentShell.close),
               completes);
         }
       }, count: 2));
@@ -127,14 +132,15 @@ webSocket.onOpen.first.then((_) =>
   test("a process can be killed synchronously after it's started", () {
     return shelf_io.serve(expectAsync((_) {}, count: 0), 'localhost', 0)
         .then((server) {
-      var dartium = new Dartium(baseUrlForAddress(server.address, server.port));
-      return dartium.close().whenComplete(server.close);
+      var contentShell = new ContentShell(
+          baseUrlForAddress(server.address, server.port));
+      return contentShell.close().whenComplete(server.close);
     });
   });
 
   test("reports an error in onExit", () {
-    var dartium = new Dartium("http://dart-lang.org",
+    var contentShell = new ContentShell("http://dart-lang.org",
         executable: "_does_not_exist");
-    expect(dartium.onExit, throwsA(new isInstanceOf<ProcessException>()));
+    expect(contentShell.onExit, throwsA(new isInstanceOf<ProcessException>()));
   });
 }