Revert 272983 "Change Shell / ShellClient to ServiceProvider"

> Change Shell / ShellClient to ServiceProvider
> 
> BUG=
> R=darin@chromium.org
> 
> Review URL: https://codereview.chromium.org/298653010

TBR=davemoore@chromium.org

Review URL: https://codereview.chromium.org/304593002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272984 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 4 deletions

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