Shell / ShellClient -> ServiceProvider

mojo/apps/js/main.js

Index: mojo/apps/js/main.js
diff --git a/mojo/apps/js/main.js b/mojo/apps/js/main.js
index a3b3dd2d482e77f627c8e79b4c43748f93f37be8..a216126b35bf9d959f057f72eb5dd16ce7ff1802 100644
--- a/mojo/apps/js/main.js
+++ b/mojo/apps/js/main.js
@@ -11,7 +11,7 @@ define([
     'mojo/apps/js/bindings/gl',
     'mojo/apps/js/bindings/threading',
     'mojo/services/native_viewport/native_viewport.mojom',
-    'mojo/public/interfaces/shell/shell.mojom',
+    'mojo/public/interfaces/service_provider/service_provider.mojom',
 ], function(console,
             monotonicClock,
             timer,
@@ -20,7 +20,7 @@ define([
             gljs,
             threading,
             nativeViewport,
-            shell) {
+            service_provider) {
 
   const VERTEX_SHADER_SOURCE = [
     'uniform mat4 u_mvpMatrix;',
@@ -276,11 +276,12 @@ define([
     return cubeIndices.length;
   }
 
-  function SampleApp(shell) {
-    this.shell_ = shell;
+  function SampleApp(service_provider) {
+    this.service_provider_ = service_provider;
 
     var pipe = new core.createMessagePipe();
-    this.shell_.connect('mojo:mojo_native_viewport_service', pipe.handle1);
+    this.service_provider_.connect('mojo:mojo_native_viewport_service',
+                                   pipe.handle1);
     new connection.Connection(pipe.handle0, NativeViewportClientImpl,
                               nativeViewport.NativeViewportProxy);
   }
@@ -288,7 +289,8 @@ define([
   // have a 'client' object that contains both the sending and receiving bits of
   // the client side of the interface. Since JS is loosely typed, we do not need
   // a separate base class to inherit from to receive callbacks.
-  SampleApp.prototype = Object.create(shell.ShellClientStub.prototype);
+  SampleApp.prototype =
+      Object.create(service_provider.ServiceProviderStub.prototype);
 
 
   function NativeViewportClientImpl(remote) {
@@ -390,6 +392,7 @@ define([
 
 
   return function(handle) {
-    new connection.Connection(handle, SampleApp, shell.ShellProxy);
+    new connection.Connection(
+        handle, SampleApp, service_provider.ServiceProviderProxy);
   };
 });