Make sure that Content Handled application can be connected multiple times.

mojo/shell/ui_application_loader_android.h

Index: mojo/shell/ui_application_loader_android.h
diff --git a/mojo/shell/ui_application_loader_android.h b/mojo/shell/ui_application_loader_android.h
index 9b8841071e70b1987a65efca06a80e839bd4af01..91d346f57836037e4486cd0083cb3dcfad724d36 100644
--- a/mojo/shell/ui_application_loader_android.h
+++ b/mojo/shell/ui_application_loader_android.h
@@ -29,7 +29,8 @@ class UIApplicationLoader : public ApplicationLoader {
   // ApplicationLoader overrides:
   void Load(ApplicationManager* manager,
             const GURL& url,
-            scoped_refptr<LoadCallbacks> callbacks) override;
+            ScopedMessagePipeHandle shell_handle,
+            LoadCallback callback) override;
   void OnApplicationError(ApplicationManager* manager,
                           const GURL& url) override;
 
@@ -42,7 +43,7 @@ class UIApplicationLoader : public ApplicationLoader {
   // isn't thread safe).
   void LoadOnUIThread(ApplicationManager* manager,
                       const GURL& url,
-                      ScopedMessagePipeHandle* shell_handle);
+                      ScopedMessagePipeHandle shell_handle);
   void OnApplicationErrorOnUIThread(ApplicationManager* manager,
                                     const GURL& url);
   void ShutdownOnUIThread();
@@ -50,9 +51,6 @@ class UIApplicationLoader : public ApplicationLoader {
   scoped_ptr<ApplicationLoader> loader_;
   shell::Context* context_;
 
-  // Lives on the UI thread. Trivial interface that calls through to |loader_|.
-  UILoader* ui_loader_;
-
   DISALLOW_COPY_AND_ASSIGN(UIApplicationLoader);
 };