Eliminate outgoing InterfaceProvider

services/shell/public/cpp/lib/service_context.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 "services/shell/public/cpp/service_context.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
@@ skipping 48 matching lines @@
   DCHECK(binding_.is_bound());
   binding_.set_connection_error_handler(
       base::Bind(&ServiceContext::OnConnectionError, base::Unretained(this)));
 
   service_->OnStart(identity_);
 }
 
 void ServiceContext::OnConnect(
     mojom::IdentityPtr source,
     uint32_t source_id,
-    mojom::InterfaceProviderRequest local_interfaces,
-    mojom::InterfaceProviderPtr remote_interfaces,
+    mojom::InterfaceProviderRequest interfaces,
     mojom::CapabilityRequestPtr allowed_capabilities,
     const mojo::String& name) {
-  std::unique_ptr<internal::ConnectionImpl> registry(
+  std::unique_ptr<internal::ConnectionImpl> connection(
       new internal::ConnectionImpl(name, source.To<Identity>(), source_id,
                                    allowed_capabilities.To<CapabilityRequest>(),
                                    Connection::State::CONNECTED));
 
   std::unique_ptr<InterfaceRegistry> exposed_interfaces(
-      new InterfaceRegistry(registry.get()));
-  exposed_interfaces->Bind(std::move(local_interfaces));
-  registry->SetExposedInterfaces(std::move(exposed_interfaces));
+      new InterfaceRegistry(connection.get()));
+  exposed_interfaces->Bind(std::move(interfaces));
+  connection->SetExposedInterfaces(std::move(exposed_interfaces));
 
-  std::unique_ptr<InterfaceProvider> interfaces(new InterfaceProvider);
-  interfaces->Bind(std::move(remote_interfaces));
-  registry->SetRemoteInterfaces(std::move(interfaces));
-
-  if (!service_->OnConnect(registry.get()))
+  if (!service_->OnConnect(connection.get()))
     return;
 
   // TODO(beng): it appears we never prune this list. We should, when the
   //             connection's remote service provider pipe breaks.
-  incoming_connections_.push_back(std::move(registry));
+  incoming_connections_.push_back(std::move(connection));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceContext, private:
 
 void ServiceContext::OnConnectionError() {
   // Note that the Service doesn't technically have to quit now, it may live
   // on to service existing connections. All existing Connectors however are
   // invalid.
   should_run_connection_lost_closure_ = service_->OnStop();
   if (should_run_connection_lost_closure_ &&
       !connection_lost_closure_.is_null())
     connection_lost_closure_.Run();
   // We don't reset the connector as clients may have taken a raw pointer to it.
   // Connect() will return nullptr if they try to connect to anything.
 }
 
 }  // namespace shell