Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/shell/dbus_service_loader_linux.cc

Index: trunk/src/mojo/shell/dbus_service_loader_linux.cc
===================================================================
--- trunk/src/mojo/shell/dbus_service_loader_linux.cc	(revision 272983)
+++ trunk/src/mojo/shell/dbus_service_loader_linux.cc	(working copy)
@@ -37,12 +37,12 @@
   LoadContext(DBusServiceLoader* loader,
               const scoped_refptr<dbus::Bus>& bus,
               const GURL& url,
-              ScopedMessagePipeHandle service_provider_handle)
+              ScopedMessagePipeHandle shell_handle)
       : loader_(loader),
         bus_(bus),
         service_dbus_proxy_(NULL),
         url_(url),
-        service_provider_handle_(service_provider_handle.Pass()),
+        shell_handle_(shell_handle.Pass()),
         keep_alive_(loader->context_) {
     base::PostTaskAndReplyWithResult(
         loader_->context_->task_runners()->io_runner(),
@@ -108,8 +108,7 @@
     mojo::AllocationScope scope;
     external_service_->Activate(
         mojo::ScopedMessagePipeHandle(
-            mojo::MessagePipeHandle(
-                service_provider_handle_.release().value())));
+            mojo::MessagePipeHandle(shell_handle_.release().value())));
   }
 
   // Should the ExternalService disappear completely, destroy connection state.
@@ -133,7 +132,7 @@
   scoped_refptr<dbus::Bus> bus_;
   dbus::ObjectProxy* service_dbus_proxy_;  // Owned by bus_;
   const GURL url_;
-  ScopedMessagePipeHandle service_provider_handle_;
+  ScopedMessagePipeHandle shell_handle_;
   KeepAlive keep_alive_;
   scoped_ptr<common::ChannelInit> channel_init_;
   ExternalServicePtr external_service_;