Change signature of OnConnect

services/shell/service_manager.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/service_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 227 matching lines @@
     return info;
   }
 
   const CapabilitySpec& capability_spec() const {
     return capability_spec_;
   }
   const Identity& identity() const { return identity_; }
   uint32_t id() const { return id_; }
 
   // Service:
-  bool OnConnect(Connection* connection) override {
-    connection->AddInterface<mojom::ServiceManager>(this);
+  bool OnConnect(const Identity& remote_identity,
+                 InterfaceRegistry* registry) override {
+    registry->AddInterface<mojom::ServiceManager>(this);
     return true;
   }
 
  private:
   // mojom::Connector implementation:
   void Connect(mojom::IdentityPtr target_ptr,
                mojom::InterfaceProviderRequest remote_interfaces,
                mojom::ClientProcessConnectionPtr client_process_connection,
                const ConnectCallback& callback) override {
     Identity target = target_ptr.To<Identity>();
@@ skipping 264 matching lines @@
   mojom::ServicePtr service;
   mojom::ServiceRequest request = mojo::GetProxy(&service);
   Connect(std::move(params), std::move(service), nullptr);
 
   return request;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceManager, Service implementation:
 
-bool ServiceManager::OnConnect(Connection* connection) {
+bool ServiceManager::OnConnect(const Identity& remote_identity,
+                               InterfaceRegistry* registry) {
   // The only interface we expose is mojom::ServiceManager, and access to this
   // interface is brokered by a policy specific to each caller, managed by the
   // caller's instance. Here we look to see who's calling, and forward to the
   // caller's instance to continue.
   Instance* instance = nullptr;
   for (const auto& entry : identity_to_instance_) {
-    if (entry.first == connection->GetRemoteIdentity()) {
+    if (entry.first == remote_identity) {
       instance = entry.second;
       break;
     }
   }
   DCHECK(instance);
-  return instance->OnConnect(connection);
+  return instance->OnConnect(remote_identity, registry);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceManager, private:
 
 void ServiceManager::InitCatalog(mojom::ServicePtr catalog) {
   // TODO(beng): It'd be great to build this from the manifest, however there's
   //             a bit of a chicken-and-egg problem.
   CapabilitySpec spec;
   Interfaces interfaces;
@@ skipping 243 matching lines @@
   // Now that the instance has a Service, we can connect to it.
   bool connected = instance->ConnectToService(&params);
   DCHECK(connected);
 }
 
 base::WeakPtr<ServiceManager> ServiceManager::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 }  // namespace shell