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

mojo/services/view_manager/view_manager_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 404 matching lines @@
 class EmbedApplicationLoader : public ApplicationLoader,
                                ApplicationDelegate,
                                public InterfaceFactory<ViewManagerClient> {
  public:
   EmbedApplicationLoader() {}
   ~EmbedApplicationLoader() override {}
 
   // ApplicationLoader implementation:
   void Load(ApplicationManager* manager,
             const GURL& url,
+            ScopedMessagePipeHandle shell_handle,
             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()));
+    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,
                           const GURL& url) override {}
 
   // ApplicationDelegate implementation:
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     connection->AddService<ViewManagerClient>(this);
     return true;
   }
@@ skipping 69 matching lines @@
                             public ApplicationDelegate,
                             public InterfaceFactory<WindowManager> {
  public:
   explicit WindowManagerLoader(EmbedApplicationLoader* app_loader)
       : app_loader_(app_loader) {}
   virtual ~WindowManagerLoader() {}
 
   // ApplicationLoader implementation:
   virtual void Load(ApplicationManager* manager,
                     const GURL& url,
+                    ScopedMessagePipeHandle shell_handle,
                     scoped_refptr<LoadCallbacks> callbacks) override {
-    ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
-    if (!shell_handle.is_valid())
-      return;
+    ASSERT_TRUE(shell_handle.is_valid());
     scoped_ptr<ApplicationImpl> app(
         new ApplicationImpl(this, shell_handle.Pass()));
     apps_.push_back(app.release());
   }
   virtual void OnApplicationError(ApplicationManager* manager,
                                   const GURL& url) override {}
 
   // ApplicationDelegate implementation:
   virtual bool ConfigureIncomingConnection(
       ApplicationConnection* connection) override {
@@ skipping 1068 matching lines @@
     EXPECT_EQ("PropertyChanged view=1,1 key=one value=NULL",
               ChangesToDescription1(connection2_->changes())[0]);
   }
 }
 
 // WARNING: this class is deprecated and will be replaced with
 // view_manager_server_apptest soonish. Add new tests there.
 
 }  // namespace service
 }  // namespace mojo