Add RegisterService, split out of Connect().

chrome/test/base/mojo_test_connector.cc

 // Copyright 2016 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 "chrome/test/base/mojo_test_connector.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 56 matching lines @@
                                                          child_token_);
 
     std::unique_ptr<service_manager::ConnectParams> params(
         new service_manager::ConnectParams);
     params->set_source(service_manager::CreateServiceManagerIdentity());
     // Use the default instance name (which should be "browser"). Otherwise a
     // service (e.g. ash) that connects to the default "content_browser"
     // will spawn a new instance.
     params->set_target(service_manager::Identity(
         kTestName, service_manager::mojom::kRootUserID));
-
-    service_manager::mojom::ClientProcessConnectionPtr
-        client_process_connection =
-            service_manager::mojom::ClientProcessConnection::New();
-    client_process_connection->service =
-        service.PassInterface().PassHandle();
-    client_process_connection->pid_receiver_request =
-        mojo::MakeRequest(&pid_receiver_).PassMessagePipe();
-    params->set_client_process_connection(std::move(client_process_connection));
+    params->set_client_process_info(std::move(service),
+                                    MakeRequest(&pid_receiver_));
     service_manager->Connect(std::move(params));
   }
 
   // Called after the test process has launched. Completes the registration done
   // in Connect().
   void ChildProcessLaunched(base::ProcessHandle handle, base::ProcessId pid) {
     pid_receiver_->SetPID(pid);
     mojo_ipc_channel_->ChildProcessLaunched();
     mojo::edk::ChildProcessLaunched(
         handle, mojo::edk::ScopedPlatformHandle(mojo::edk::PlatformHandle(
@@ skipping 164 matching lines @@
 MojoTestConnector::~MojoTestConnector() {}
 
 std::unique_ptr<content::TestState> MojoTestConnector::PrepareForTest(
     base::CommandLine* command_line,
     base::TestLauncher::LaunchOptions* test_launch_options) {
   std::unique_ptr<MojoTestState> test_state(
       new MojoTestState(&background_service_manager_));
   test_state->Init(command_line, test_launch_options);
   return std::move(test_state);
 }