Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/service_manager/background_service_loader.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/service_manager/background_service_loader.h"
 
 #include "base/bind.h"
 #include "mojo/service_manager/service_manager.h"
 
 namespace mojo {
 
 class BackgroundServiceLoader::BackgroundLoader {
  public:
   explicit BackgroundLoader(ServiceLoader* loader) : loader_(loader) {}
   ~BackgroundLoader() {}
 
   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) {
     loader_->OnServiceError(manager, url);
   }
 
  private:
   base::MessageLoop::Type message_loop_type_;
   ServiceLoader* loader_;  // Owned by BackgroundServiceLoader
 
@@ skipping 42 matching lines @@
     thread_.Start();
   thread_.message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&BackgroundServiceLoader::OnServiceErrorOnBackgroundThread,
                  base::Unretained(this), manager, url));
 }
 
 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(
     ServiceManager* manager,
     const GURL& url) {
   if (!background_loader_)
     background_loader_ = new BackgroundLoader(loader_.get());
   background_loader_->OnServiceError(manager, url);
 }
 
 void BackgroundServiceLoader::ShutdownOnBackgroundThread() {
   delete background_loader_;
   // Destroy |loader_| on the thread it's actually used on.
   loader_.reset();
 }
 
 }  // namespace mojo