Make ServiceRegistry (which implements) ApplicationConnection just wrap a ServiceProviderImpl.

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 d48f16126730c5589b8dcafd9d4163bdc86bb54d..74372d3c62be4d493cb27a629fc9a1b8802a0a5b 100644
--- a/mojo/public/cpp/application/lib/service_registry.cc
+++ b/mojo/public/cpp/application/lib/service_registry.cc
@@ -10,46 +10,41 @@
 namespace mojo {
 namespace internal {
 
-ServiceRegistry::ServiceRegistry() : local_binding_(this) {}
+ServiceRegistry::ServiceRegistry() {}
 
 ServiceRegistry::ServiceRegistry(
     const ConnectionContext& connection_context,
     InterfaceRequest<ServiceProvider> local_services)
-    : connection_context_(connection_context), local_binding_(this) {
-  if (local_services.is_pending())
-    local_binding_.Bind(local_services.Pass());
-}
+    : service_provider_impl_(connection_context, local_services.Pass()) {}
 
 ServiceRegistry::~ServiceRegistry() {}
 
 void ServiceRegistry::SetServiceConnectorForName(
     ServiceConnector* service_connector,
     const std::string& interface_name) {
-  service_connector_registry_.SetServiceConnectorForName(
+  service_provider_impl_.AddServiceForName(
       std::unique_ptr<ServiceConnector>(service_connector), interface_name);
 }
 
 void ServiceRegistry::RemoveServiceConnectorForName(
     const std::string& interface_name) {
-  service_connector_registry_.RemoveServiceConnectorForName(interface_name);
+  service_provider_impl_.RemoveServiceForName(interface_name);
+}
+
+ServiceProviderImpl& ServiceRegistry::GetServiceProviderImpl() {
+  return service_provider_impl_;
 }
 
 const ConnectionContext& ServiceRegistry::GetConnectionContext() const {
-  return connection_context_;
+  return service_provider_impl_.connection_context();
 }
 
 const std::string& ServiceRegistry::GetConnectionURL() {
-  return connection_context_.connection_url;
+  return service_provider_impl_.connection_context().connection_url;
 }
 
 const std::string& ServiceRegistry::GetRemoteApplicationURL() {
-  return connection_context_.remote_url;
-}
-
-void ServiceRegistry::ConnectToService(const String& service_name,
-                                       ScopedMessagePipeHandle client_handle) {
-  service_connector_registry_.ConnectToService(connection_context_,
-                                               service_name, &client_handle);
+  return service_provider_impl_.connection_context().remote_url;
 }
 
 }  // namespace internal