Add RegisterService, split out of Connect().

services/service_manager/tests/util.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 "services/service_manager/tests/util.h"
 
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 18 matching lines @@
 namespace {
 
 void QuitLoop(base::RunLoop* loop) {
   loop->Quit();
 }
 
 }  // namespace
 
 std::unique_ptr<Connection> LaunchAndConnectToProcess(
     const std::string& target_exe_name,
-    const Identity target,
+    const Identity& target,
     service_manager::Connector* connector,
     base::Process* process) {
   base::FilePath target_path;
   CHECK(base::PathService::Get(base::DIR_EXE, &target_path));
   target_path = target_path.AppendASCII(target_exe_name);
 
   base::CommandLine child_command_line(target_path);
   // Forward the wait-for-debugger flag but nothing else - we don't want to
   // stamp on the platform-channel flag.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 17 matching lines @@
   // Allocate the pipe locally.
   std::string child_token = mojo::edk::GenerateRandomToken();
   mojo::ScopedMessagePipeHandle pipe =
       mojo::edk::CreateParentMessagePipe(primordial_pipe_token, child_token);
 
   service_manager::mojom::ServicePtr client;
   client.Bind(mojo::InterfacePtrInfo<service_manager::mojom::Service>(
       std::move(pipe), 0u));
   service_manager::mojom::PIDReceiverPtr receiver;
 
-  service_manager::Connector::ConnectParams params(target);
-  params.set_client_process_connection(std::move(client),
-                                       MakeRequest(&receiver));
+  connector->RegisterService(target, std::move(client), MakeRequest(&receiver));
   std::unique_ptr<service_manager::Connection> connection =
-      connector->Connect(&params);
+      connector->Connect(target);
   {
     base::RunLoop loop;
     connection->AddConnectionCompletedClosure(base::Bind(&QuitLoop, &loop));
     base::MessageLoop::ScopedNestableTaskAllower allow(
         base::MessageLoop::current());
     loop.Run();
   }
 
   base::LaunchOptions options;
 #if defined(OS_WIN)
   options.handles_to_inherit = &handle_passing_info;
 #elif defined(OS_POSIX)
   options.fds_to_remap = &handle_passing_info;
 #endif
   *process = base::LaunchProcess(child_command_line, options);
   DCHECK(process->IsValid());
   receiver->SetPID(process->Pid());
   mojo::edk::ChildProcessLaunched(process->Handle(),
                                   platform_channel_pair.PassServerHandle(),
                                   child_token);
   return connection;
 }
 
 }  // namespace test
 }  // namespace service_manager