| Index: mojo/edk/test/mojo_test_base.cc
|
| diff --git a/mojo/edk/test/mojo_test_base.cc b/mojo/edk/test/mojo_test_base.cc
|
| index 5d77a1123d2fd153fccd428b9da5e5df669a2d9d..cf78caadc119dacd75558a2aef2d4d457a127cd1 100644
|
| --- a/mojo/edk/test/mojo_test_base.cc
|
| +++ b/mojo/edk/test/mojo_test_base.cc
|
| @@ -44,14 +44,15 @@ MojoTestBase::~MojoTestBase() {}
|
| MojoTestBase::ClientController& MojoTestBase::StartClient(
|
| const std::string& client_name) {
|
| clients_.push_back(base::MakeUnique<ClientController>(
|
| - client_name, this, process_error_callback_));
|
| + client_name, this, process_error_callback_, launch_type_));
|
| return *clients_.back();
|
| }
|
|
|
| MojoTestBase::ClientController::ClientController(
|
| const std::string& client_name,
|
| MojoTestBase* test,
|
| - const ProcessErrorCallback& process_error_callback) {
|
| + const ProcessErrorCallback& process_error_callback,
|
| + LaunchType launch_type) {
|
| #if !defined(OS_IOS)
|
| #if defined(OS_MACOSX)
|
| // This lock needs to be held while launching the child because the Mach port
|
| @@ -63,7 +64,7 @@ MojoTestBase::ClientController::ClientController(
|
| base::AutoLock lock(g_mach_broker->GetLock());
|
| #endif
|
| helper_.set_process_error_callback(process_error_callback);
|
| - pipe_ = helper_.StartChild(client_name);
|
| + pipe_ = helper_.StartChild(client_name, launch_type);
|
| #if defined(OS_MACOSX)
|
| g_mach_broker->AddPlaceholderForPid(helper_.test_child().Handle());
|
| #endif
|
|
|