| Index: mojo/edk/test/multiprocess_test_helper.cc
|
| diff --git a/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.cc b/mojo/edk/test/multiprocess_test_helper.cc
|
| similarity index 85%
|
| copy from third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.cc
|
| copy to mojo/edk/test/multiprocess_test_helper.cc
|
| index b462893ff6d28b728c61c286dc49162cd083b67a..10645f9311e1b3dd4825b51ebc8447df60af55ba 100644
|
| --- a/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.cc
|
| +++ b/mojo/edk/test/multiprocess_test_helper.cc
|
| @@ -2,20 +2,21 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.h"
|
| +#include "mojo/edk/test/multiprocess_test_helper.h"
|
|
|
| #include "base/command_line.h"
|
| #include "base/logging.h"
|
| #include "base/process/kill.h"
|
| #include "base/process/process_handle.h"
|
| #include "build/build_config.h"
|
| -#include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h"
|
| +#include "mojo/edk/embedder/platform_channel_pair.h"
|
|
|
| namespace mojo {
|
| +namespace edk {
|
| namespace test {
|
|
|
| MultiprocessTestHelper::MultiprocessTestHelper() {
|
| - platform_channel_pair_.reset(new embedder::PlatformChannelPair());
|
| + platform_channel_pair_.reset(new PlatformChannelPair());
|
| server_platform_handle = platform_channel_pair_->PassServerHandle();
|
| }
|
|
|
| @@ -41,7 +42,7 @@ void MultiprocessTestHelper::StartChildWithExtraSwitch(
|
|
|
| base::CommandLine command_line(
|
| base::GetMultiProcessTestChildBaseCommandLine());
|
| - embedder::HandlePassingInformation handle_passing_info;
|
| + HandlePassingInformation handle_passing_info;
|
| platform_channel_pair_->PrepareToPassClientHandleToChildProcess(
|
| &command_line, &handle_passing_info);
|
|
|
| @@ -88,12 +89,13 @@ bool MultiprocessTestHelper::WaitForChildTestShutdown() {
|
| void MultiprocessTestHelper::ChildSetup() {
|
| CHECK(base::CommandLine::InitializedForCurrentProcess());
|
| client_platform_handle =
|
| - embedder::PlatformChannelPair::PassClientHandleFromParentProcess(
|
| + PlatformChannelPair::PassClientHandleFromParentProcess(
|
| *base::CommandLine::ForCurrentProcess());
|
| }
|
|
|
| // static
|
| -embedder::ScopedPlatformHandle MultiprocessTestHelper::client_platform_handle;
|
| +ScopedPlatformHandle MultiprocessTestHelper::client_platform_handle;
|
|
|
| } // namespace test
|
| +} // namespace edk
|
| } // namespace mojo
|
|
|