Pass ServiceProvider and ServiceProvider& params in Connect

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,
-                                 ServiceProviderPtr service_provider)
+ServiceRegistry::ServiceRegistry(
+    ApplicationImpl* application_impl,
+    const std::string& url,
+    ServiceProviderPtr remote_services,
+    InterfaceRequest<ServiceProvider> local_services)
     : application_impl_(application_impl),
       url_(url),
-      remote_service_provider_(service_provider.Pass()) {
-  remote_service_provider_.set_client(this);
+      local_binding_(this, local_services.Pass()),
+      remote_service_provider_(remote_services.Pass()) {
 }
 
-ServiceRegistry::ServiceRegistry() : application_impl_(nullptr) {
+ServiceRegistry::ServiceRegistry()
+    : application_impl_(nullptr), local_binding_(this) {
 }
 
 ServiceRegistry::~ServiceRegistry() {
   for (NameToServiceConnectorMap::iterator i =
            name_to_service_connector_.begin();
        i != name_to_service_connector_.end();
        ++i) {
     delete i->second;
   }
   name_to_service_connector_.clear();
@@ skipping 45 matching lines @@
     return;
   }
   internal::ServiceConnectorBase* service_connector =
       name_to_service_connector_[service_name];
   return service_connector->ConnectToService(service_name,
                                              client_handle.Pass());
 }
 
 }  // namespace internal
 }  // namespace mojo