Eliminate Quit() from Shell, and roll Shell & Connector together.

content/test/data/web_ui_mojo_shell_test.js

Index: content/test/data/web_ui_mojo_shell_test.js
diff --git a/content/test/data/web_ui_mojo_shell_test.js b/content/test/data/web_ui_mojo_shell_test.js
index f6faf1ce245136b57d8d143c4e697bcf38d03f85..57ea6bb1532c7dce3dc33e5fc7cbb8b56c56711f 100644
--- a/content/test/data/web_ui_mojo_shell_test.js
+++ b/content/test/data/web_ui_mojo_shell_test.js
@@ -28,13 +28,10 @@ define('main', [
 
   return function() {
     domAutomationController.setAutomationId(0);
-    var shellPipe = serviceRegistry.connectToService(shellMojom.Shell.name);
-    var shell = new shellMojom.Shell.proxyClass(new router.Router(shellPipe));
-
-    var pipe = core.createMessagePipe();
-    var connector =
-        new shellMojom.Connector.proxyClass(new router.Router(pipe.handle0));
-    shell.getConnector(pipe.handle1);
+    var connectorPipe =
+        serviceRegistry.connectToService(shellMojom.Connector.name);
+    var connector = new shellMojom.Connector.proxyClass(
+        new router.Router(connectorPipe));
 
     connector.connect(
         TEST_APP_URL, 1,