Mojo: Move platform handle/channel stuff in system to embedder namespace.

These things are exposed through the embedder API (and/or to be used by
the embedder).

R=sky@chromium.org

Review URL: https://codereview.chromium.org/137063010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245303 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 9 deletions

diff --git a/mojo/common/test/multiprocess_test_base.cc b/mojo/common/test/multiprocess_test_base.cc
index 9a1b8b3..527c227 100644
--- a/mojo/common/test/multiprocess_test_base.cc
+++ b/mojo/common/test/multiprocess_test_base.cc
@@ -30,7 +30,7 @@ void MultiprocessTestBase::SetUp() {
 
 // TODO(vtl): Not implemented on Windows yet.
 #if defined(OS_POSIX)
-  platform_channel_pair_.reset(new system::PlatformChannelPair());
+  platform_channel_pair_.reset(new embedder::PlatformChannelPair());
   server_platform_handle = platform_channel_pair_->PassServerHandle();
 #endif
 }
@@ -103,13 +103,13 @@ void MultiprocessTestBase::ChildSetup() {
 // TODO(vtl): Not implemented on Windows yet.
 #if defined(OS_POSIX)
   client_platform_handle =
-      system::PlatformChannelPair::PassClientHandleFromParentProcess(
+      embedder::PlatformChannelPair::PassClientHandleFromParentProcess(
           *CommandLine::ForCurrentProcess());
 #endif
 }
 
 // static
-system::ScopedPlatformHandle MultiprocessTestBase::client_platform_handle;
+embedder::ScopedPlatformHandle MultiprocessTestBase::client_platform_handle;
 
 }  // namespace test
 }  // namespace mojo
diff --git a/mojo/common/test/multiprocess_test_base.h b/mojo/common/test/multiprocess_test_base.h
index 9b233f0..2c8ce77 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_;
diff --git a/mojo/common/test/multiprocess_test_base_unittest.cc b/mojo/common/test/multiprocess_test_base_unittest.cc
index 114d22c..45f2b6b 100644
--- a/mojo/common/test/multiprocess_test_base_unittest.cc
+++ b/mojo/common/test/multiprocess_test_base_unittest.cc
@@ -51,7 +51,7 @@ TEST_F(MultiprocessTestBaseTest, PassedChannelPosix) {
   StartChild("PassedChannelPosix");
 
   // Take ownership of the FD.
-  system::ScopedPlatformHandle handle = server_platform_handle.Pass();
+  embedder::ScopedPlatformHandle handle = server_platform_handle.Pass();
   int fd = handle.get().fd;
 
   // The FD should be non-blocking. Check this.
@@ -78,7 +78,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(PassedChannelPosix) {
   CHECK(MultiprocessTestBaseTest::client_platform_handle.is_valid());
 
   // Take ownership of the FD.
-  system::ScopedPlatformHandle handle =
+  embedder::ScopedPlatformHandle handle =
       MultiprocessTestBaseTest::client_platform_handle.Pass();
   int fd = handle.get().fd;