Simple multi-url support for mojo apps

mojo/public/cpp/application/lib/application_impl.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/public/cpp/application/application_impl.h"
 
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/lib/service_registry.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/environment/logging.h"
@@ skipping 44 matching lines @@
 
 ApplicationConnection* ApplicationImpl::ConnectToApplication(
     const String& application_url) {
   MOJO_CHECK(shell_);
   ServiceProviderPtr local_services;
   InterfaceRequest<ServiceProvider> local_request = GetProxy(&local_services);
   ServiceProviderPtr remote_services;
   shell_->ConnectToApplication(application_url, GetProxy(&remote_services),
                                local_services.Pass());
   internal::ServiceRegistry* registry = new internal::ServiceRegistry(
-      this, application_url, remote_services.Pass(), local_request.Pass());
+      this, application_url, application_url, remote_services.Pass(),
+      local_request.Pass());
   if (!delegate_->ConfigureOutgoingConnection(registry)) {
     delete registry;
     return nullptr;
   }
   outgoing_service_registries_.push_back(registry);
   return registry;
 }
 
 void ApplicationImpl::Initialize(ShellPtr shell,
                                  Array<String> args,
@@ skipping 14 matching lines @@
 void ApplicationImpl::UnbindConnections(
     InterfaceRequest<Application>* application_request,
     ShellPtr* shell) {
   *application_request = binding_.Unbind();
   shell->Bind(shell_.PassMessagePipe());
 }
 
 void ApplicationImpl::AcceptConnection(
     const String& requestor_url,
     InterfaceRequest<ServiceProvider> services,
-    ServiceProviderPtr exposed_services) {
+    ServiceProviderPtr exposed_services,
+    const String& url) {
   internal::ServiceRegistry* registry = new internal::ServiceRegistry(
-      this, requestor_url, exposed_services.Pass(), services.Pass());
+      this, url, requestor_url, exposed_services.Pass(), services.Pass());
   if (!delegate_->ConfigureIncomingConnection(registry)) {
     delete registry;
     return;
   }
   incoming_service_registries_.push_back(registry);
 }
 
 void ApplicationImpl::RequestQuit() {
   delegate_->Quit();
   Terminate();
 }
 
 }  // namespace mojo