Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/service_manager/background_service_loader.cc

Index: trunk/src/mojo/service_manager/background_service_loader.cc
===================================================================
--- trunk/src/mojo/service_manager/background_service_loader.cc	(revision 272983)
+++ trunk/src/mojo/service_manager/background_service_loader.cc	(working copy)
@@ -16,8 +16,8 @@
 
   void LoadService(ServiceManager* manager,
                    const GURL& url,
-                   ScopedMessagePipeHandle service_provider_handle) {
-    loader_->LoadService(manager, url, service_provider_handle.Pass());
+                   ScopedMessagePipeHandle shell_handle) {
+    loader_->LoadService(manager, url, shell_handle.Pass());
   }
 
   void OnServiceError(ServiceManager* manager, const GURL& url) {
@@ -80,11 +80,10 @@
 void BackgroundServiceLoader::LoadServiceOnBackgroundThread(
     ServiceManager* manager,
     const GURL& url,
-    ScopedMessagePipeHandle* service_provider_handle) {
+    ScopedMessagePipeHandle* shell_handle) {
   if (!background_loader_)
     background_loader_ = new BackgroundLoader(loader_.get());
-  background_loader_->LoadService(
-      manager, url, service_provider_handle->Pass());
+  background_loader_->LoadService(manager, url, shell_handle->Pass());
 }
 
 void BackgroundServiceLoader::OnServiceErrorOnBackgroundThread(