Index: mojo/edk/test/multiprocess_test_helper.h |
diff --git a/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.h b/mojo/edk/test/multiprocess_test_helper.h |
similarity index 86% |
copy from third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.h |
copy to mojo/edk/test/multiprocess_test_helper.h |
index c11d79b911195096c35e6db2edbe9019df6db552..3ff8b85ad9aeb8cf4db841d9cfbc6815f1af3cb2 100644 |
--- a/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.h |
+++ b/mojo/edk/test/multiprocess_test_helper.h |
@@ -2,23 +2,22 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_ |
-#define THIRD_PARTY_MOJO_SRC_MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_ |
+#ifndef MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_ |
+#define MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_ |
#include <string> |
#include "base/process/process.h" |
#include "base/test/multiprocess_test.h" |
#include "base/test/test_timeouts.h" |
+#include "mojo/edk/embedder/scoped_platform_handle.h" |
#include "mojo/public/cpp/system/macros.h" |
#include "testing/multiprocess_func_list.h" |
-#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" |
namespace mojo { |
-namespace embedder { |
+namespace edk { |
class PlatformChannelPair; |
-} |
namespace test { |
@@ -55,13 +54,13 @@ class MultiprocessTestHelper { |
static void ChildSetup(); |
// For use in the main process: |
- embedder::ScopedPlatformHandle server_platform_handle; |
+ ScopedPlatformHandle server_platform_handle; |
// For use (and only valid) in the child process: |
- static embedder::ScopedPlatformHandle client_platform_handle; |
+ static ScopedPlatformHandle client_platform_handle; |
private: |
- scoped_ptr<embedder::PlatformChannelPair> platform_channel_pair_; |
+ scoped_ptr<PlatformChannelPair> platform_channel_pair_; |
// Valid after |StartChild()| and before |WaitForChildShutdown()|. |
base::Process test_child_; |
@@ -75,7 +74,7 @@ class MultiprocessTestHelper { |
#define MOJO_MULTIPROCESS_TEST_CHILD_MAIN(test_child_name) \ |
MULTIPROCESS_TEST_MAIN_WITH_SETUP( \ |
test_child_name##TestChildMain, \ |
- ::mojo::test::MultiprocessTestHelper::ChildSetup) |
+ test::MultiprocessTestHelper::ChildSetup) |
// Use this (and |WaitForChildTestShutdown()|) for the child process's "main()", |
// if you want to use |EXPECT_...()| or |ASSERT_...()|; it has a |void| return |
@@ -93,6 +92,7 @@ class MultiprocessTestHelper { |
void test_child_name##TestChildTest() |
} // namespace test |
+} // namespace edk |
} // namespace mojo |
-#endif // THIRD_PARTY_MOJO_SRC_MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_ |
+#endif // MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_ |