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

mojo/services/view_manager/view_manager_unittest.cc

Index: mojo/services/view_manager/view_manager_unittest.cc
diff --git a/mojo/services/view_manager/view_manager_unittest.cc b/mojo/services/view_manager/view_manager_unittest.cc
index 6f64ad8c653757524ec4e758f403f2160e5fa19b..c573cf160e221b4f0f9fb0fef47018318fd1f6ce 100644
--- a/mojo/services/view_manager/view_manager_unittest.cc
+++ b/mojo/services/view_manager/view_manager_unittest.cc
@@ -422,12 +422,11 @@ class EmbedApplicationLoader : public ApplicationLoader,
   // ApplicationLoader implementation:
   void Load(ApplicationManager* manager,
             const GURL& url,
-            scoped_refptr<LoadCallbacks> callbacks) override {
-    ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
-    if (!shell_handle.is_valid())
-      return;
-    scoped_ptr<ApplicationImpl> app(new ApplicationImpl(this,
-                                                        shell_handle.Pass()));
+            ScopedMessagePipeHandle shell_handle,
+            LoadCallback callback) override {
+    ASSERT_TRUE(shell_handle.is_valid());
+    scoped_ptr<ApplicationImpl> app(
+        new ApplicationImpl(this, shell_handle.Pass()));
     apps_.push_back(app.release());
   }
   void OnApplicationError(ApplicationManager* manager,
@@ -517,10 +516,9 @@ class WindowManagerLoader : public ApplicationLoader,
   // ApplicationLoader implementation:
   virtual void Load(ApplicationManager* manager,
                     const GURL& url,
-                    scoped_refptr<LoadCallbacks> callbacks) override {
-    ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
-    if (!shell_handle.is_valid())
-      return;
+                    ScopedMessagePipeHandle shell_handle,
+                    LoadCallback callback) override {
+    ASSERT_TRUE(shell_handle.is_valid());
     scoped_ptr<ApplicationImpl> app(
         new ApplicationImpl(this, shell_handle.Pass()));
     apps_.push_back(app.release());