Change Shell / ShellClient to ServiceProvider

content/browser/mojo/mojo_application_host.h

Index: content/browser/mojo/mojo_application_host.h
diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h
index d9c61a5c3671e9dbac7d6877df5d27f7573f1338..84d350d3fe813365695f791368d5579936a1b186 100644
--- a/content/browser/mojo/mojo_application_host.h
+++ b/content/browser/mojo/mojo_application_host.h
@@ -8,7 +8,7 @@
 #include "base/process/process_handle.h"
 #include "mojo/common/channel_init.h"
 #include "mojo/embedder/scoped_platform_handle.h"
-#include "mojo/public/interfaces/shell/shell.mojom.h"
+#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 
 namespace IPC {
 class Sender;
@@ -34,27 +34,29 @@ class MojoApplicationHost {
 
   bool did_activate() const { return did_activate_; }
 
-  mojo::ShellClient* shell_client() {
-    DCHECK(shell_.get());
-    return shell_->client();
+  mojo::ServiceProvider* service_provider() {
+    DCHECK(child_service_provider_.get());
+    return child_service_provider_->client();
   }
 
  private:
-  class ShellImpl : public mojo::InterfaceImpl<mojo::Shell> {
+  class ServiceProviderImpl
+      : public mojo::InterfaceImpl<mojo::ServiceProvider> {
    public:
     virtual void OnConnectionError() OVERRIDE {
       // TODO(darin): How should we handle this error?
     }
 
-    // mojo::Shell methods:
-    virtual void Connect(const mojo::String& url,
-                         mojo::ScopedMessagePipeHandle handle) OVERRIDE;
+    // mojo::ServiceProvider methods:
+    virtual void ConnectToService(
+        const mojo::String& url,
+        mojo::ScopedMessagePipeHandle handle) OVERRIDE;
   };
 
   mojo::common::ChannelInit channel_init_;
   mojo::embedder::ScopedPlatformHandle client_handle_;
 
-  scoped_ptr<ShellImpl> shell_;
+  scoped_ptr<ServiceProviderImpl> child_service_provider_;
 
   bool did_activate_;