Pass ServiceProvider and ServiceProvider& params in Connect

mojo/public/cpp/application/lib/application_impl.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/application_impl.h"
 
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/lib/service_registry.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/environment/logging.h"
@@ skipping 43 matching lines @@
 }
 
 ApplicationImpl::~ApplicationImpl() {
   ClearConnections();
   delete shell_watch_;
 }
 
 ApplicationConnection* ApplicationImpl::ConnectToApplication(
     const String& application_url) {
   MOJO_CHECK(initialized_);
-  ServiceProviderPtr out_service_provider;
-  shell_->ConnectToApplication(application_url,
-                               GetProxy(&out_service_provider));
+  ServiceProviderPtr local_services;
+  InterfaceRequest<ServiceProvider> local_request = GetProxy(&local_services);
+  ServiceProviderPtr remote_services;
+  shell_->ConnectToApplication(application_url, GetProxy(&remote_services),
+                               local_services.Pass());
   internal::ServiceRegistry* registry = new internal::ServiceRegistry(
-      this, application_url, out_service_provider.Pass());
+      this, application_url, remote_services.Pass(), local_request.Pass());
   if (!delegate_->ConfigureOutgoingConnection(registry)) {
     delete registry;
     return nullptr;
   }
   outgoing_service_registries_.push_back(registry);
   return registry;
 }
 
 bool ApplicationImpl::WaitForInitialize() {
   MOJO_CHECK(!initialized_);
@@ skipping 13 matching lines @@
   delegate_->Initialize(this);
 }
 
 void ApplicationImpl::BindShell(ScopedMessagePipeHandle shell_handle) {
   shell_watch_ = new ShellPtrWatcher(this);
   shell_.Bind(shell_handle.Pass());
   shell_.set_client(this);
   shell_.set_error_handler(shell_watch_);
 }
 
-void ApplicationImpl::AcceptConnection(const String& requestor_url,
-                                       ServiceProviderPtr service_provider) {
+void ApplicationImpl::AcceptConnection(
+    const String& requestor_url,
+    InterfaceRequest<ServiceProvider> services,
+    ServiceProviderPtr exposed_services) {
   internal::ServiceRegistry* registry = new internal::ServiceRegistry(
-      this, requestor_url, service_provider.Pass());
+      this, requestor_url, exposed_services.Pass(), services.Pass());
   if (!delegate_->ConfigureIncomingConnection(registry)) {
     delete registry;
     return;
   }
   incoming_service_registries_.push_back(registry);
 }
 
 }  // namespace mojo