Revert 288013 "First cut at "content handling" support in Mojo."

trunk/src/mojo/service_manager/background_shell_service_loader.h

Index: trunk/src/mojo/service_manager/background_shell_service_loader.h
===================================================================
--- trunk/src/mojo/service_manager/background_shell_service_loader.h	(revision 288042)
+++ trunk/src/mojo/service_manager/background_shell_service_loader.h	(working copy)
@@ -26,9 +26,9 @@
   virtual ~BackgroundShellServiceLoader();
 
   // ServiceLoader overrides:
-  virtual void Load(ServiceManager* manager,
-                    const GURL& url,
-                    scoped_refptr<LoadCallbacks> callbacks) OVERRIDE;
+  virtual void LoadService(ServiceManager* manager,
+                           const GURL& url,
+                           ScopedMessagePipeHandle shell_handle) OVERRIDE;
   virtual void OnServiceError(ServiceManager* manager,
                               const GURL& url) OVERRIDE;
 
@@ -42,9 +42,10 @@
   // to |background_loader_| to do the actual loading.
   // TODO: having this code take a |manager| is fragile (as ServiceManager isn't
   // thread safe).
-  void LoadOnBackgroundThread(ServiceManager* manager,
-                              const GURL& url,
-                              ScopedMessagePipeHandle* shell_handle);
+  void LoadServiceOnBackgroundThread(
+      ServiceManager* manager,
+      const GURL& url,
+      ScopedMessagePipeHandle* shell_handle);
   void OnServiceErrorOnBackgroundThread(ServiceManager* manager,
                                         const GURL& url);
   bool quit_on_shutdown_;