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

mojo/application_manager/application_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 "base/at_exit.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/application_manager/application_loader.h"
 #include "mojo/application_manager/application_manager.h"
@@ skipping 97 matching lines @@
   }
 
   void set_context(TestContext* context) { context_ = context; }
   int num_loads() const { return num_loads_; }
   const std::vector<std::string>& GetArgs() const { return test_app_->args(); }
 
  private:
   // 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,
                           const GURL& url) override {}
 
   // ApplicationDelegate implementation.
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     connection->AddService(this);
     return true;
   }
@@ skipping 187 matching lines @@
                public InterfaceFactory<TestB>,
                public InterfaceFactory<TestC> {
  public:
   Tester(TesterContext* context, const std::string& requestor_url)
       : context_(context), requestor_url_(requestor_url) {}
   ~Tester() override {}
 
  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,
                           const GURL& url) override {}
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     if (!requestor_url_.empty() &&
         requestor_url_ != connection->GetRemoteApplicationURL()) {
       context_->set_tester_called_quit();
       context_->QuitSoon();
@@ skipping 371 matching lines @@
   TestServicePtr test_service2;
   application_manager_->ConnectToService(GURL("foo:foo2"), &test_service2);
   EXPECT_EQ(2, test_loader_->num_loads());
 
   TestServicePtr test_service3;
   application_manager_->ConnectToService(GURL("bar:bar"), &test_service2);
   EXPECT_EQ(3, test_loader_->num_loads());
 }
 
 }  // namespace mojo