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

trunk/src/mojo/service_manager/service_manager_unittest.cc

Index: trunk/src/mojo/service_manager/service_manager_unittest.cc
===================================================================
--- trunk/src/mojo/service_manager/service_manager_unittest.cc	(revision 288042)
+++ trunk/src/mojo/service_manager/service_manager_unittest.cc	(working copy)
@@ -118,12 +118,12 @@
 
  private:
   // ServiceLoader implementation.
-  virtual void Load(ServiceManager* manager,
-                    const GURL& url,
-                    scoped_refptr<LoadCallbacks> callbacks) OVERRIDE {
+  virtual void LoadService(
+      ServiceManager* manager,
+      const GURL& url,
+      ScopedMessagePipeHandle service_provider_handle) OVERRIDE {
     ++num_loads_;
-    test_app_.reset(
-        new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
+    test_app_.reset(new ApplicationImpl(this, service_provider_handle.Pass()));
   }
 
   virtual void OnServiceError(ServiceManager* manager,
@@ -332,11 +332,11 @@
   virtual ~Tester() {}
 
  private:
-  virtual void Load(ServiceManager* manager,
-                    const GURL& url,
-                    scoped_refptr<LoadCallbacks> callbacks) OVERRIDE {
-    app_.reset(
-        new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
+  virtual void LoadService(
+      ServiceManager* manager,
+      const GURL& url,
+      ScopedMessagePipeHandle shell_handle) OVERRIDE {
+    app_.reset(new ApplicationImpl(this, shell_handle.Pass()));
   }
 
   virtual void OnServiceError(ServiceManager* manager,