Change Shell / ShellClient to ServiceProvider

mojo/service_manager/background_service_loader.h

Index: mojo/service_manager/background_service_loader.h
diff --git a/mojo/service_manager/background_service_loader.h b/mojo/service_manager/background_service_loader.h
index 9b4d757d3bd57822a2ab8fd2dafaf5ca7672e1a8..59dbc0f86db1e31be4bc5347c43b4c7395942037 100644
--- a/mojo/service_manager/background_service_loader.h
+++ b/mojo/service_manager/background_service_loader.h
@@ -38,9 +38,10 @@ class MOJO_SERVICE_MANAGER_EXPORT BackgroundServiceLoader
   // to |background_loader_| to do the actual loading.
   // TODO: having this code take a |manager| is fragile (as ServiceManager isn't
   // thread safe).
-  void LoadServiceOnBackgroundThread(ServiceManager* manager,
-                                     const GURL& url,
-                                     ScopedMessagePipeHandle* shell_handle);
+  void LoadServiceOnBackgroundThread(
+      ServiceManager* manager,
+      const GURL& url,
+      ScopedMessagePipeHandle* service_provider_handle);
   void OnServiceErrorOnBackgroundThread(ServiceManager* manager,
                                         const GURL& url);
   void ShutdownOnBackgroundThread();