Abstract out connection information into ConnectionContext.

mojo/public/cpp/application/lib/service_registry.cc

Index: mojo/public/cpp/application/lib/service_registry.cc
diff --git a/mojo/public/cpp/application/lib/service_registry.cc b/mojo/public/cpp/application/lib/service_registry.cc
index 734dc1b3bb59dca1b351bcfaa5be88a1a1c55d97..6be0e100bc6804d57cef043ede377d6d3c58645f 100644
--- a/mojo/public/cpp/application/lib/service_registry.cc
+++ b/mojo/public/cpp/application/lib/service_registry.cc
@@ -13,12 +13,9 @@ namespace internal {
 ServiceRegistry::ServiceRegistry() : local_binding_(this) {}
 
 ServiceRegistry::ServiceRegistry(
-    const std::string& connection_url,
-    const std::string& remote_url,
+    const ConnectionContext& connection_context,
     InterfaceRequest<ServiceProvider> local_services)
-    : connection_url_(connection_url),
-      remote_url_(remote_url),
-      local_binding_(this) {
+    : connection_context_(connection_context), local_binding_(this) {
   if (local_services.is_pending())
     local_binding_.Bind(local_services.Pass());
 }
@@ -38,11 +35,11 @@ void ServiceRegistry::RemoveServiceConnectorForName(
 }
 
 const std::string& ServiceRegistry::GetConnectionURL() {
-  return connection_url_;
+  return connection_context_.connection_url;
 }
 
 const std::string& ServiceRegistry::GetRemoteApplicationURL() {
-  return remote_url_;
+  return connection_context_.remote_url;
 }
 
 void ServiceRegistry::ConnectToService(const String& service_name,