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

mojo/shell/network_application_loader.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 "mojo/shell/network_application_loader.h"
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "mojo/public/cpp/application/application_connection.h"
@@ skipping 13 matching lines @@
 namespace shell {
 
 NetworkApplicationLoader::NetworkApplicationLoader() {
 }
 
 NetworkApplicationLoader::~NetworkApplicationLoader() {
 }
 
 void NetworkApplicationLoader::Load(ApplicationManager* manager,
                                     const GURL& url,
-                                    scoped_refptr<LoadCallbacks> callbacks) {
-  ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
-  if (!shell_handle.is_valid())
-    return;
-
+                                    ScopedMessagePipeHandle shell_handle,
+                                    LoadCallback callback) {
+  DCHECK(shell_handle.is_valid());
   uintptr_t key = reinterpret_cast<uintptr_t>(manager);
   if (apps_.find(key) == apps_.end()) {
     scoped_ptr<ApplicationImpl> app(
         new ApplicationImpl(this, shell_handle.Pass()));
     apps_.add(key, app.Pass());
   }
 }
 
 void NetworkApplicationLoader::OnApplicationError(ApplicationManager* manager,
                                                   const GURL& url) {
@@ skipping 12 matching lines @@
 }
 
 void NetworkApplicationLoader::Create(
     ApplicationConnection* connection,
     InterfaceRequest<NetworkService> request) {
   BindToRequest(new NetworkServiceImpl(connection, context_.get()), &request);
 }
 
 }  // namespace shell
 }  // namespace mojo