Simple multi-url support for mojo apps

shell/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/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/application/application_connection.h"
@@ skipping 104 matching lines @@
   void Load(const GURL& url,
             InterfaceRequest<Application> application_request) override {
     ++num_loads_;
     test_app_.reset(new ApplicationImpl(this, application_request.Pass()));
   }
 
   void OnApplicationError(ApplicationManager* manager,
                           const GURL& url) override {}
 
   // ApplicationDelegate implementation.
-  bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
+  bool ConfigureIncomingConnection(ApplicationConnection* connection, const std::string& url) override {
     connection->AddService(this);
     return true;
   }
 
   // InterfaceFactory implementation.
   void Create(ApplicationConnection* connection,
               InterfaceRequest<TestService> request) override {
     new TestServiceImpl(context_, request.Pass());
   }
 
@@ skipping 197 matching lines @@
 
  private:
   void Load(const GURL& url,
             InterfaceRequest<Application> application_request) override {
     app_.reset(new ApplicationImpl(this, application_request.Pass()));
   }
 
   void OnApplicationError(ApplicationManager* manager,
                           const GURL& url) override {}
 
-  bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
+  bool ConfigureIncomingConnection(ApplicationConnection* connection, const std::string& url) override {
     if (!requestor_url_.empty() &&
         requestor_url_ != connection->GetRemoteApplicationURL()) {
       context_->set_tester_called_quit();
       context_->QuitSoon();
       base::MessageLoop::current()->Quit();
       return false;
     }
     // If we're coming from A, then add B, otherwise A.
     if (connection->GetRemoteApplicationURL() == kTestAURLString)
       connection->AddService<TestB>(this);
@@ skipping 62 matching lines @@
 
 class TestExternal : public ApplicationDelegate {
  public:
   TestExternal() : configure_incoming_connection_called_(false) {}
 
   void Initialize(ApplicationImpl* app) override {
     initialize_args_ = app->args();
     base::MessageLoop::current()->Quit();
   }
 
-  bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
+  bool ConfigureIncomingConnection(ApplicationConnection* connection, const std::string& url) override {
     configure_incoming_connection_called_ = true;
     base::MessageLoop::current()->Quit();
     return true;
   }
 
   const std::vector<std::string>& initialize_args() const {
     return initialize_args_;
   }
 
   bool configure_incoming_connection_called() const {
@@ skipping 247 matching lines @@
   // ApplicationManager, so this cannot succeed (but also shouldn't crash).
   TestCPtr c;
   application_manager_->ConnectToService(GURL(kTestAURLString), &c);
   QuitMessageLoopErrorHandler quitter;
   c.set_error_handler(&quitter);
 
   loop_.Run();
   EXPECT_TRUE(c.encountered_error());
 }
 
 TEST_F(ApplicationManagerTest, MappedURLsShouldNotCauseDuplicateLoad) {

[qsr, 2015/02/27 17:15:58]

Don't you want to add test, checking that url with query string are handled
correctly?

[Aaron Boodman, 2015/02/28 19:08:23]

I did test that in the apptest. This file is really more about testing the
custom loaders. I'm not sure what the right behavior is there:

if I set a custom loader for test:test, should it fire for test:test?monkey ?

I guess so... but the loaders are already so gnarly and hateful, I'm kind of
loathe to add more features to them. They should die anyway.

In any case, feels like separate change.

   test_delegate_.AddMapping(GURL("foo:foo2"), GURL("foo:foo"));
   // 1 because ApplicationManagerTest connects once at startup.
   EXPECT_EQ(1, test_loader_->num_loads());
 
   TestServicePtr test_service;
   application_manager_->ConnectToService(GURL("foo:foo"), &test_service);
   EXPECT_EQ(2, test_loader_->num_loads());
 
   TestServicePtr test_service2;
   application_manager_->ConnectToService(GURL("foo:foo2"), &test_service2);
@@ skipping 28 matching lines @@
                                                     application.Pass());
   loop_.Run();
   EXPECT_EQ(args, external.initialize_args());
   application_manager_->ConnectToServiceByName(GURL("mojo:test"),
                                                std::string());
   loop_.Run();
   EXPECT_TRUE(external.configure_incoming_connection_called());
 };
 
 }  // namespace mojo