Shell / ShellClient -> ServiceProvider

content/browser/mojo/mojo_application_host.cc

Index: content/browser/mojo/mojo_application_host.cc
diff --git a/content/browser/mojo/mojo_application_host.cc b/content/browser/mojo/mojo_application_host.cc
index 25b63d56e99f52fda85cb06e782e3afec832a207..082564769043e9bf9ef7c9285ff2198e730137d8 100644
--- a/content/browser/mojo/mojo_application_host.cc
+++ b/content/browser/mojo/mojo_application_host.cc
@@ -30,7 +30,7 @@ MojoApplicationHost::~MojoApplicationHost() {
 }
 
 bool MojoApplicationHost::Init() {
-  DCHECK(!shell_.get()) << "Already initialized!";
+  DCHECK(!child_service_provider_.get()) << "Already initialized!";
 
   mojo::embedder::PlatformChannelPair channel_pair;
 
@@ -43,7 +43,8 @@ bool MojoApplicationHost::Init() {
   // Forward this to the client once we know its process handle.
   client_handle_ = channel_pair.PassClientHandle();
 
-  shell_.reset(BindToPipe(new ShellImpl(), message_pipe.Pass()));
+  child_service_provider_.reset(
+      BindToPipe(new ServiceProviderImpl(), message_pipe.Pass()));
   return true;
 }
 
@@ -59,7 +60,7 @@ bool MojoApplicationHost::Activate(IPC::Sender* sender,
   return did_activate_;
 }
 
-void MojoApplicationHost::ShellImpl::Connect(
+void MojoApplicationHost::ServiceProviderImpl::ConnectToService(
     const mojo::String& url,
     mojo::ScopedMessagePipeHandle handle) {
   // TODO(darin): Provide something meaningful here.