Abstract out connection information into ConnectionContext.

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

Index: mojo/public/cpp/application/lib/service_registry.h
diff --git a/mojo/public/cpp/application/lib/service_registry.h b/mojo/public/cpp/application/lib/service_registry.h
index c8c47d3acf277d52447923e79debca83925081d5..50e5a433518a564df53525b04194ba245e7a19e2 100644
--- a/mojo/public/cpp/application/lib/service_registry.h
+++ b/mojo/public/cpp/application/lib/service_registry.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "mojo/public/cpp/application/application_connection.h"
+#include "mojo/public/cpp/application/connection_context.h"
 #include "mojo/public/cpp/application/lib/service_connector_registry.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
@@ -21,8 +22,7 @@ namespace internal {
 class ServiceRegistry : public ServiceProvider, public ApplicationConnection {
  public:
   ServiceRegistry();
-  ServiceRegistry(const std::string& connection_url,
-                  const std::string& remote_url,
+  ServiceRegistry(const ConnectionContext& connection_context,
                   InterfaceRequest<ServiceProvider> local_services);
   ~ServiceRegistry() override;
 
@@ -39,8 +39,7 @@ class ServiceRegistry : public ServiceProvider, public ApplicationConnection {
   void ConnectToService(const String& service_name,
                         ScopedMessagePipeHandle client_handle) override;
 
-  const std::string connection_url_;
-  const std::string remote_url_;
+  ConnectionContext connection_context_;
   Binding<ServiceProvider> local_binding_;
   ServiceConnectorRegistry service_connector_registry_;