First cut at "content handling" support in Mojo.

mojo/shell/ui_service_loader_android.h

Index: mojo/shell/ui_service_loader_android.h
diff --git a/mojo/shell/ui_service_loader_android.h b/mojo/shell/ui_service_loader_android.h
index ebe6df9800ab2f97405e33bf659296ce6bcf13fa..8cce7099b04e76eae7c27223e9dee7c4d27e685b 100644
--- a/mojo/shell/ui_service_loader_android.h
+++ b/mojo/shell/ui_service_loader_android.h
@@ -25,9 +25,9 @@ class UIServiceLoader : public ServiceLoader {
   virtual ~UIServiceLoader();
 
   // ServiceLoader overrides:
-  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;
 
@@ -38,9 +38,9 @@ class UIServiceLoader : public ServiceLoader {
   // to |background_loader_| to do the actual loading.
   // TODO: having this code take a |manager| is fragile (as ServiceManager isn't
   // thread safe).
-  void LoadServiceOnUIThread(ServiceManager* manager,
-                             const GURL& url,
-                             ScopedMessagePipeHandle* shell_handle);
+  void LoadOnUIThread(ServiceManager* manager,
+                      const GURL& url,
+                      ScopedMessagePipeHandle* shell_handle);
   void OnServiceErrorOnUIThread(ServiceManager* manager, const GURL& url);
   void ShutdownOnUIThread();