Simple multi-url support for mojo apps

shell/external_application_listener_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/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/test_io_thread.h"
@@ skipping 86 matching lines @@
  public:
   StubShellImpl(ApplicationPtr application)
       : application_(application.Pass()), binding_(this) {
     ShellPtr shell;
     binding_.Bind(GetProxy(&shell));
     application_->Initialize(shell.Pass(), Array<String>(), "");
   }
   ~StubShellImpl() override {}
 
  private:
-  void ConnectToApplication(const String& requestor_url,
+  void ConnectToApplication(const String& app_url,
                             InterfaceRequest<ServiceProvider> services,
                             ServiceProviderPtr exposed_services) override {
-    application_->AcceptConnection(requestor_url, services.Pass(),
-                                   exposed_services.Pass());
+    application_->AcceptConnection("", services.Pass(), exposed_services.Pass(),
+                                   app_url);
   }
 
   ApplicationPtr application_;
   StrongBinding<Shell> binding_;
 };
 
 void DoLocalRegister(const GURL& app_url,
                      const std::vector<std::string>& args,
                      ApplicationPtr application) {
   new StubShellImpl(application.Pass());
@@ skipping 22 matching lines @@
 namespace {
 
 class QuitLoopOnConnectApp : public ApplicationDelegate {
  public:
   QuitLoopOnConnectApp(const std::string& url,
                        scoped_refptr<base::TaskRunner> loop,
                        base::Closure quit_callback)
       : url_(url), to_quit_(loop), quit_callback_(quit_callback) {}
 
  private:
-  bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
+  bool ConfigureIncomingConnection(ApplicationConnection* connection, const std::string& url) override {
     DVLOG(1) << url_ << " accepting connection from "
              << connection->GetRemoteApplicationURL();
     to_quit_->PostTask(FROM_HERE, quit_callback_);
     return true;
   }
 
   const std::string url_;
   scoped_refptr<base::TaskRunner> to_quit_;
   base::Closure quit_callback_;
 };
@@ skipping 109 matching lines @@
   run_loop.Run();
 
   // The apps need to be destroyed on the thread where they did socket stuff.
   io_runner()->PostTask(
       FROM_HERE, base::Bind(&DestroyOnIOThread, base::Passed(&supersweet_app),
                             base::Passed(&awesome_app)));
 }
 
 }  // namespace shell
 }  // namespace mojo