Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/content/child/mojo/mojo_application.cc

Index: trunk/src/content/child/mojo/mojo_application.cc
===================================================================
--- trunk/src/content/child/mojo/mojo_application.cc	(revision 272983)
+++ trunk/src/content/child/mojo/mojo_application.cc	(working copy)
@@ -10,8 +10,8 @@
 
 namespace content {
 
-MojoApplication::MojoApplication(mojo::ServiceProvider* service_provider)
-    : service_provider_(service_provider) {
+MojoApplication::MojoApplication(mojo::ShellClient* shell_client)
+    : shell_client_(shell_client) {
 }
 
 MojoApplication::~MojoApplication() {
@@ -38,8 +38,8 @@
                          ChildProcess::current()->io_message_loop_proxy());
   DCHECK(message_pipe.is_valid());
 
-  host_service_provider_.Bind(message_pipe.Pass());
-  host_service_provider_.set_client(service_provider_);
+  shell_.Bind(message_pipe.Pass());
+  shell_.set_client(shell_client_);
 }
 
 }  // namespace content