Eliminate Connector::Connect(), Connection, etc.

services/service_manager/tests/util.h

 // 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.
 
 #ifndef SERVICES_SERVICE_MANAGER_TESTS_UTIL_H_
 #define SERVICES_SERVICE_MANAGER_TESTS_UTIL_H_
 
 #include <memory>
 #include <string>
 
+#include "services/service_manager/public/interfaces/connector.mojom.h"
+
 namespace base {
 class Process;
 }
 
 namespace service_manager {
-class Connection;
 class Connector;
 class Identity;
 
 namespace test {
 
 // Starts the process @ |target_exe_name| and connects to it as |target| using
-// |connector|, returning the connection & the process.
+// |connector|, returning a ConnectResult for the StartService() call.
 // This blocks until the connection is established/rejected by the service
 // manager.
-std::unique_ptr<Connection> LaunchAndConnectToProcess(
+service_manager::mojom::ConnectResult LaunchAndConnectToProcess(
     const std::string& target_exe_name,
     const Identity& target,
     service_manager::Connector* connector,
     base::Process* process);
 
 }  // namespace test
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_TESTS_UTIL_H_