Mojo JS Bindings: merge Application, Shell, ServiceProvider with Sky

mojo/services/public/js/shell.js

 // Copyright 2014 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.
 
 define("mojo/services/public/js/shell", [
   "mojo/public/js/bindings",
   "mojo/public/js/core",
   "mojo/public/js/connection",
   "mojo/public/interfaces/application/shell.mojom",
   "mojo/public/interfaces/application/service_provider.mojom",
   "mojo/services/public/js/service_provider",
-], function(bindings,
-            core,
-            connection,
-            shellMojom,
-            serviceProviderMojom,
-            serviceProvider) {
+], function(bindings, core, connection, shellMojom, spMojom, sp) {
 
   const ProxyBindings = bindings.ProxyBindings;
   const StubBindings = bindings.StubBindings;
-  const ServiceProvider = serviceProvider.ServiceProvider;
-  const ServiceProviderInterface = serviceProviderMojom.ServiceProvider;
+  const ServiceProvider = sp.ServiceProvider;
+  const ServiceProviderInterface = spMojom.ServiceProvider;
   const ShellInterface = shellMojom.Shell;
 
   class Shell {
     constructor(shellHandle, app) {
       this.shellHandle = shellHandle;
       this.proxy = connection.bindProxyHandle(
           shellHandle, ShellInterface.client, ShellInterface);
 
       ProxyBindings(this.proxy).setLocalDelegate(app);
       // TODO: call this serviceProviders_
@@ skipping 22 matching lines @@
       });
       this.applications_.clear();
       core.close(this.shellHandle);
     }
   }
 
   var exports = {};
   exports.Shell = Shell;
   return exports;
 });