Index: mojo/common/test/multiprocess_test_base.h |
diff --git a/mojo/common/test/multiprocess_test_base.h b/mojo/common/test/multiprocess_test_base.h |
index 9b233f0ada6b2462b437df76235fa83fc2ad1d06..2c8ce77217ebf1750ca3635a72b4984d1db7e7e2 100644 |
--- a/mojo/common/test/multiprocess_test_base.h |
+++ b/mojo/common/test/multiprocess_test_base.h |
@@ -16,7 +16,7 @@ |
namespace mojo { |
-namespace system { |
+namespace embedder { |
class PlatformChannelPair; |
} |
@@ -45,16 +45,16 @@ class MultiprocessTestBase : public base::MultiProcessTest { |
static void ChildSetup(); |
// For use in the main process: |
- system::ScopedPlatformHandle server_platform_handle; |
+ embedder::ScopedPlatformHandle server_platform_handle; |
// For use (and only valid) in the child process: |
- static system::ScopedPlatformHandle client_platform_handle; |
+ static embedder::ScopedPlatformHandle client_platform_handle; |
private: |
virtual CommandLine MakeCmdLine(const std::string& procname, |
bool debug_on_start) OVERRIDE; |
- scoped_ptr<system::PlatformChannelPair> platform_channel_pair_; |
+ scoped_ptr<embedder::PlatformChannelPair> platform_channel_pair_; |
// Valid after |StartChild()| and before |WaitForChildShutdown()|. |
base::ProcessHandle test_child_handle_; |