Reland r288013: First cut at "content handling" support in Mojo.

mojo/service_manager/service_manager_unittest.cc

Index: mojo/service_manager/service_manager_unittest.cc
diff --git a/mojo/service_manager/service_manager_unittest.cc b/mojo/service_manager/service_manager_unittest.cc
index f42113f5a66ca4457dfe25c29e6c97d128c2b875..0f984c17daaecee726872df485700d9061ea2a34 100644
--- a/mojo/service_manager/service_manager_unittest.cc
+++ b/mojo/service_manager/service_manager_unittest.cc
@@ -118,12 +118,12 @@ class TestServiceLoader : public ServiceLoader,
 
  private:
   // ServiceLoader implementation.
-  virtual void LoadService(
-      ServiceManager* manager,
-      const GURL& url,
-      ScopedMessagePipeHandle service_provider_handle) OVERRIDE {
+  virtual void Load(ServiceManager* manager,
+                    const GURL& url,
+                    scoped_refptr<LoadCallbacks> callbacks) OVERRIDE {
     ++num_loads_;
-    test_app_.reset(new ApplicationImpl(this, service_provider_handle.Pass()));
+    test_app_.reset(
+        new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
   }
 
   virtual void OnServiceError(ServiceManager* manager,
@@ -332,11 +332,11 @@ class Tester : public ApplicationDelegate,
   virtual ~Tester() {}
 
  private:
-  virtual void LoadService(
-      ServiceManager* manager,
-      const GURL& url,
-      ScopedMessagePipeHandle shell_handle) OVERRIDE {
-    app_.reset(new ApplicationImpl(this, shell_handle.Pass()));
+  virtual void Load(ServiceManager* manager,
+                    const GURL& url,
+                    scoped_refptr<LoadCallbacks> callbacks) OVERRIDE {
+    app_.reset(
+        new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
   }
 
   virtual void OnServiceError(ServiceManager* manager,