IPC::ChannelMojo: Introduce IPC::MojoBootstrap for Windows

ipc/ipc_test_base.cc

Index: ipc/ipc_test_base.cc
diff --git a/ipc/ipc_test_base.cc b/ipc/ipc_test_base.cc
index 6abef0f1470b47b721dbf16ad7de8a188e9d2204..05a0c2cac421cb54803338243c52a57e9c6e5d35 100644
--- a/ipc/ipc_test_base.cc
+++ b/ipc/ipc_test_base.cc
@@ -52,8 +52,7 @@ void IPCTestBase::InitWithCustomMessageLoop(
 }
 
 void IPCTestBase::CreateChannel(IPC::Listener* listener) {
-  CreateChannelFromChannelHandle(
-      GetChannelName(test_client_name_), listener);
+  CreateChannelFromChannelHandle(GetTestChannelHandle(), listener);
 }
 
 bool IPCTestBase::ConnectChannel() {
@@ -90,8 +89,7 @@ void IPCTestBase::CreateChannelProxy(
   CHECK(!channel_.get());
   CHECK(!channel_proxy_.get());
   channel_proxy_ = IPC::ChannelProxy::Create(
-      CreateChannelFactory(GetChannelName(test_client_name_),
-                           ipc_task_runner.get()),
+      CreateChannelFactory(GetTestChannelHandle(), ipc_task_runner.get()),
       listener,
       ipc_task_runner);
 }
@@ -101,29 +99,49 @@ void IPCTestBase::DestroyChannelProxy() {
   channel_proxy_.reset();
 }
 
+namespace {}  // namespace

[viettrungluu, 2014/09/17 17:33:15]

delete

[Hajime Morrita, 2014/09/17 19:33:48]

Oops. done.

+
+std::string IPCTestBase::GetTestMainName() const {
+  return test_client_name_ + "TestClientMain";
+}
+
+bool IPCTestBase::DidStartClient() {
+  DCHECK_NE(base::kNullProcessHandle, client_process_);
+  return client_process_ != base::kNullProcessHandle;
+}
+
+#if defined(OS_POSIX)
+
 bool IPCTestBase::StartClient() {
-  DCHECK(client_process_ == base::kNullProcessHandle);
+  return StartClientWithFD(channel_
+                               ? channel_->GetClientFileDescriptor()
+                               : channel_proxy_->GetClientFileDescriptor());
+}
 
-  std::string test_main = test_client_name_ + "TestClientMain";
+bool IPCTestBase::StartClientWithFD(int ipcfd) {
+  DCHECK_EQ(client_process_, base::kNullProcessHandle);
 
-#if defined(OS_WIN)
-  client_process_ = SpawnChild(test_main);
-#elif defined(OS_POSIX)
   base::FileHandleMappingVector fds_to_map;
-  const int ipcfd = channel_.get()
-      ? channel_->GetClientFileDescriptor()
-      : channel_proxy_->GetClientFileDescriptor();
   if (ipcfd > -1)
     fds_to_map.push_back(std::pair<int, int>(ipcfd,
         kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor));
   base::LaunchOptions options;
   options.fds_to_remap = &fds_to_map;
-  client_process_ = SpawnChildWithOptions(test_main, options);
-#endif
+  client_process_ = SpawnChildWithOptions(GetTestMainName(), options);
 
-  return client_process_ != base::kNullProcessHandle;
+  return DidStartClient();
+}
+
+#elif defined(OS_WIN)
+
+bool IPCTestBase::StartClient() {
+  DCHECK_EQ(client_process_, base::kNullProcessHandle);
+  client_process_ = SpawnChild(GetTestMainName());
+  return DidStartClient();
 }
 
+#endif
+
 bool IPCTestBase::WaitForClientShutdown() {
   DCHECK(client_process_ != base::kNullProcessHandle);
 
@@ -134,6 +152,10 @@ bool IPCTestBase::WaitForClientShutdown() {
   return rv;
 }
 
+IPC::ChannelHandle IPCTestBase::GetTestChannelHandle() {
+  return GetChannelName(test_client_name_);
+}
+
 scoped_refptr<base::TaskRunner> IPCTestBase::task_runner() {
   return message_loop_->message_loop_proxy();
 }