Simple multi-url support for mojo apps

mojo/public/cpp/application/lib/service_registry.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/lib/service_registry.h"
 
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/lib/service_connector.h"
 
 namespace mojo {
 namespace internal {
 
 ServiceRegistry::ServiceRegistry(
     ApplicationImpl* application_impl,
-    const std::string& url,
+    const std::string& connection_url,
+    const std::string& remote_url,
     ServiceProviderPtr remote_services,
     InterfaceRequest<ServiceProvider> local_services)
     : application_impl_(application_impl),
-      url_(url),
+      connection_url_(connection_url),
+      remote_url_(remote_url),
       local_binding_(this),
       remote_service_provider_(remote_services.Pass()) {
   if (local_services.is_pending())
     local_binding_.Bind(local_services.Pass());
 }
 
 ServiceRegistry::ServiceRegistry()
     : application_impl_(nullptr), local_binding_(this) {
 }
 
@@ skipping 25 matching lines @@
     ServiceConnectorBase* service_connector) {
   NameToServiceConnectorMap::iterator it =
       name_to_service_connector_.find(service_connector->name());
   if (it == name_to_service_connector_.end())
     return false;
   delete it->second;
   name_to_service_connector_.erase(it);
   return true;
 }
 
+const std::string& ServiceRegistry::GetConnectionURL() {
+  return connection_url_;
+}
+
 const std::string& ServiceRegistry::GetRemoteApplicationURL() {
-  return url_;
+  return remote_url_;
 }
 
 ServiceProvider* ServiceRegistry::GetServiceProvider() {
   return remote_service_provider_.get();
 }
 
 void ServiceRegistry::ConnectToService(const mojo::String& service_name,
                                        ScopedMessagePipeHandle client_handle) {
   if (name_to_service_connector_.find(service_name) ==
       name_to_service_connector_.end()) {
     client_handle.reset();
     return;
   }
   internal::ServiceConnectorBase* service_connector =
       name_to_service_connector_[service_name];
   return service_connector->ConnectToService(service_name,
                                              client_handle.Pass());
 }
 
 }  // namespace internal
 }  // namespace mojo