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

mojo/application_manager/application_manager_unittest.cc

Index: mojo/application_manager/application_manager_unittest.cc
diff --git a/mojo/application_manager/application_manager_unittest.cc b/mojo/application_manager/application_manager_unittest.cc
index 4db97064e202e1ceb7a615b10a9509aa8b4413b5..8283f32e28a7c642d14654571f5382a162d5cf54 100644
--- a/mojo/application_manager/application_manager_unittest.cc
+++ b/mojo/application_manager/application_manager_unittest.cc
@@ -115,10 +115,10 @@ class TestApplicationLoader : public ApplicationLoader,
   // ApplicationLoader implementation.
   void Load(ApplicationManager* manager,
             const GURL& url,
-            scoped_refptr<LoadCallbacks> callbacks) override {
+            ScopedMessagePipeHandle shell_handle,
+            LoadCallback callbacks) override {

[Aaron Boodman, 2014/11/19 16:09:57]

here and elsewhere, can you change the param name to 'callback' (singular)?

[qsr, 2014/11/19 16:37:22]

Done.

     ++num_loads_;
-    test_app_.reset(
-        new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
+    test_app_.reset(new ApplicationImpl(this, shell_handle.Pass()));
   }
 
   void OnApplicationError(ApplicationManager* manager,
@@ -326,9 +326,9 @@ class Tester : public ApplicationDelegate,
  private:
   void Load(ApplicationManager* manager,
             const GURL& url,
-            scoped_refptr<LoadCallbacks> callbacks) override {
-    app_.reset(
-        new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
+            ScopedMessagePipeHandle shell_handle,
+            LoadCallback callbacks) override {
+    app_.reset(new ApplicationImpl(this, shell_handle.Pass()));
   }
 
   void OnApplicationError(ApplicationManager* manager,