Change signature of OnConnect

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"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/shell/public/cpp/capabilities.h"
-#include "services/shell/public/cpp/lib/connection_impl.h"
+#include "services/shell/public/cpp/interface_registry.h"
 #include "services/shell/public/cpp/lib/connector_impl.h"
 #include "services/shell/public/cpp/service.h"
 
 namespace shell {
 
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceContext, public:
 
 ServiceContext::ServiceContext(shell::Service* service,
                                mojom::ServiceRequest request,
@@ skipping 35 matching lines @@
   binding_.set_connection_error_handler(
       base::Bind(&ServiceContext::OnConnectionError, base::Unretained(this)));
 
   service_->OnStart(identity_);
 }
 
 void ServiceContext::OnConnect(
     mojom::IdentityPtr source,
     mojom::InterfaceProviderRequest interfaces,
     mojom::CapabilityRequestPtr allowed_capabilities) {
-  std::unique_ptr<internal::ConnectionImpl> connection(
-      new internal::ConnectionImpl(source.To<Identity>(),
-                                   allowed_capabilities.To<CapabilityRequest>(),
-                                   Connection::State::CONNECTED));
+  shell::Identity remote_identity = source.To<Identity>();
+  std::unique_ptr<InterfaceRegistry> registry(
+      new InterfaceRegistry(remote_identity,
+                            allowed_capabilities.To<CapabilityRequest>()));
+  registry->Bind(std::move(interfaces));
 
-  std::unique_ptr<InterfaceRegistry> exposed_interfaces(
-      new InterfaceRegistry(connection.get()));
-  exposed_interfaces->Bind(std::move(interfaces));
-  connection->SetExposedInterfaces(std::move(exposed_interfaces));
-
-  if (!service_->OnConnect(connection.get()))
+  if (!service_->OnConnect(remote_identity, registry.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(connection));
+  //             registry's remote interface provider pipe breaks.
+  incoming_connections_.push_back(std::move(registry));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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