Add RegisterService, split out of Connect().

content/common/service_manager/child_connection.cc

 // Copyright 2015 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 "content/common/service_manager/child_connection.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 76 matching lines @@
   void InitializeOnIOThread(
       const service_manager::Identity& child_identity,
       std::unique_ptr<service_manager::Connector> connector,
       mojo::ScopedMessagePipeHandle service_pipe) {
     service_manager::mojom::ServicePtr service;
     service.Bind(mojo::InterfacePtrInfo<service_manager::mojom::Service>(
         std::move(service_pipe), 0u));
     service_manager::mojom::PIDReceiverRequest pid_receiver_request(
         &pid_receiver_);
 
-    service_manager::Connector::ConnectParams params(child_identity);
-    params.set_client_process_connection(std::move(service),
-                                         std::move(pid_receiver_request));
-
-    // In some unit testing scenarios a null connector is passed.
-    if (connector)
-      connection_ = connector->Connect(&params);
+    if (connector) {
+      connector->RegisterService(child_identity,
+                                 std::move(service),
+                                 std::move(pid_receiver_request));
+      connection_ = connector->Connect(child_identity);
+    }
   }
 
   void ShutDownOnIOThread() {
     connection_.reset();
     pid_receiver_.reset();
   }
 
   void SetProcessHandleOnIOThread(base::ProcessHandle handle) {
     DCHECK(pid_receiver_.is_bound());
     pid_receiver_->SetPID(base::GetProcId(handle));
@@ skipping 32 matching lines @@
 
 ChildConnection::~ChildConnection() {
   context_->ShutDown();
 }
 
 void ChildConnection::SetProcessHandle(base::ProcessHandle handle) {
   context_->SetProcessHandle(handle);
 }
 
 }  // namespace content