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

mojo/shell/dbus_service_loader_linux.h

Index: mojo/shell/dbus_service_loader_linux.h
diff --git a/mojo/shell/dbus_service_loader_linux.h b/mojo/shell/dbus_service_loader_linux.h
index a24af5fdc5b8c71c65de88e935c59ee1f7dae6ea..1aae927c97b0921cd68e8909db4850474710f4b2 100644
--- a/mojo/shell/dbus_service_loader_linux.h
+++ b/mojo/shell/dbus_service_loader_linux.h
@@ -61,9 +61,9 @@ class DBusServiceLoader : public ServiceLoader {
   // the name "org.chromium.EchoService" and invoke the method
   // "org.chromium.Mojo.ConnectChannel" on the object exported at
   // "/org/chromium/MojoImpl".
-  virtual void LoadService(ServiceManager* manager,
-                           const GURL& url,
-                           ScopedMessagePipeHandle shell_handle) OVERRIDE;
+  virtual void Load(ServiceManager* manager,
+                    const GURL& url,
+                    scoped_refptr<LoadCallbacks> callbacks) OVERRIDE;
 
   virtual void OnServiceError(ServiceManager* manager, const GURL& url)
       OVERRIDE;