Shell / ShellClient -> ServiceProvider

content/child/mojo/mojo_application.h

Index: content/child/mojo/mojo_application.h
diff --git a/content/child/mojo/mojo_application.h b/content/child/mojo/mojo_application.h
index 88646b63ff4545e522c2c3b4d594be8262200db0..ef05f75fb768e66bc58138570e8506ed8a83c925 100644
--- a/content/child/mojo/mojo_application.h
+++ b/content/child/mojo/mojo_application.h
@@ -7,7 +7,7 @@
 
 #include "ipc/ipc_platform_file.h"
 #include "mojo/common/channel_init.h"
-#include "mojo/public/interfaces/shell/shell.mojom.h"
+#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 
 namespace IPC {
 class Message;
@@ -24,19 +24,21 @@ class MojoApplication {
  public:
   // The ShellClient pointer must remain valid for the lifetime of the
   // MojoApplication instance.
-  explicit MojoApplication(mojo::ShellClient* shell_client);
+  explicit MojoApplication(mojo::ServiceProvider* service_provider);
   ~MojoApplication();
 
   bool OnMessageReceived(const IPC::Message& msg);
 
-  mojo::Shell* shell() { return shell_.get(); }
+  mojo::ServiceProvider* host_service_provider() {
+    return host_service_provider_.get();
+  }
 
  private:
   void OnActivate(const IPC::PlatformFileForTransit& file);
 
   mojo::common::ChannelInit channel_init_;
-  mojo::ShellPtr shell_;
-  mojo::ShellClient* shell_client_;
+  mojo::ServiceProviderPtr host_service_provider_;
+  mojo::ServiceProvider* service_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoApplication);
 };