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

mojo/application_manager/application_loader.h

Index: mojo/application_manager/application_loader.h
diff --git a/mojo/application_manager/application_loader.h b/mojo/application_manager/application_loader.h
index f6e4e40adb3405958d7982f852d063fbefe6faa4..26c7f78f7679b0491e10d1f4cf2f0cca67e94cf6 100644
--- a/mojo/application_manager/application_loader.h
+++ b/mojo/application_manager/application_loader.h
@@ -27,13 +27,9 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationLoader {
   class MOJO_APPLICATION_MANAGER_EXPORT LoadCallbacks

[Aaron Boodman, 2014/11/18 23:46:15]

We don't need LoadCallbacks anymore. We can just use an actual base::Callback,
right?

[qsr, 2014/11/19 13:42:37]

Done.

       : public base::RefCounted<LoadCallbacks> {
    public:
-    // Register the requested application with ApplicationManager. If the
-    // returned handle is valid, it should be used to implement the
-    // mojo::Application interface.
-    virtual ScopedMessagePipeHandle RegisterApplication() = 0;
-
     // Load the requested application with a content handler.
     virtual void LoadWithContentHandler(const GURL& content_handler_url,
+                                        ScopedMessagePipeHandle shell_handle,
                                         URLResponsePtr url_response) = 0;

[DaveMoore, 2014/11/18 17:00:45]

I like this. It's a lot more like ApplicationLoader used to be before the
ContentHandler support was added.

 
    protected:
@@ -41,21 +37,6 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationLoader {
     virtual ~LoadCallbacks() {}
   };
 
-  // Implements RegisterApplication() by returning a handle that was specified
-  // at construction time. LoadWithContentHandler() is not supported.
-  class MOJO_APPLICATION_MANAGER_EXPORT SimpleLoadCallbacks
-      : public LoadCallbacks {
-   public:
-    SimpleLoadCallbacks(ScopedMessagePipeHandle shell_handle);
-    ScopedMessagePipeHandle RegisterApplication() override;
-    void LoadWithContentHandler(const GURL& content_handler_url,
-                                URLResponsePtr response) override;
-
-   private:
-    ScopedMessagePipeHandle shell_handle_;
-    ~SimpleLoadCallbacks() override;
-  };
-
   virtual ~ApplicationLoader() {}
 
   // Load the application named |url|. Applications can be loaded two ways:
@@ -73,6 +54,7 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationLoader {
   //    interface.
   virtual void Load(ApplicationManager* application_manager,
                     const GURL& url,
+                    ScopedMessagePipeHandle shell_handle,
                     scoped_refptr<LoadCallbacks> callbacks) = 0;
 
   // Called when the Application exits.