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

content/test/data/web_ui_mojo_shell_test.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 /**
  * This URL is defined in content/public/test/test_mojo_app.cc. It identifies
  * content_shell's out-of-process Mojo test app.
  */
 var TEST_APP_URL = 'system:content_mojo_test';
@@ skipping 10 matching lines @@
 
   var connectToService = function(serviceProvider, iface) {
     var pipe = core.createMessagePipe();
     var service = new iface.proxyClass(new router.Router(pipe.handle0));
     serviceProvider.getInterface(iface.name, pipe.handle1);
     return service;
   };
 
   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,
         function (services) {
           var test = connectToService(services, testMojom.TestMojoService);
           test.getRequestorURL().then(function(response) {
             domAutomationController.send(
                 response.url == 'chrome://mojo-web-ui/');
           });
         },
         function (exposedServices) {});
   };
 });