Change Shell / ShellClient to ServiceProvider

mojo/service_manager/background_service_loader.cc

Index: mojo/service_manager/background_service_loader.cc
diff --git a/mojo/service_manager/background_service_loader.cc b/mojo/service_manager/background_service_loader.cc
index 16004cabd0a6c798f77d2a290acf1dd5a1399dde..96a2c430a8980b43b7769be2cc83118b1e325e63 100644
--- a/mojo/service_manager/background_service_loader.cc
+++ b/mojo/service_manager/background_service_loader.cc
@@ -16,8 +16,8 @@ class BackgroundServiceLoader::BackgroundLoader {
 
   void LoadService(ServiceManager* manager,
                    const GURL& url,
-                   ScopedMessagePipeHandle shell_handle) {
-    loader_->LoadService(manager, url, shell_handle.Pass());
+                   ScopedMessagePipeHandle service_provider_handle) {
+    loader_->LoadService(manager, url, service_provider_handle.Pass());
   }
 
   void OnServiceError(ServiceManager* manager, const GURL& url) {
@@ -80,10 +80,11 @@ void BackgroundServiceLoader::OnServiceError(ServiceManager* manager,
 void BackgroundServiceLoader::LoadServiceOnBackgroundThread(
     ServiceManager* manager,
     const GURL& url,
-    ScopedMessagePipeHandle* shell_handle) {
+    ScopedMessagePipeHandle* service_provider_handle) {
   if (!background_loader_)
     background_loader_ = new BackgroundLoader(loader_.get());
-  background_loader_->LoadService(manager, url, shell_handle->Pass());
+  background_loader_->LoadService(
+      manager, url, service_provider_handle->Pass());
 }
 
 void BackgroundServiceLoader::OnServiceErrorOnBackgroundThread(