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

ipc/ipc_test_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #include "ipc/ipc_test_base.h"
 
 #include "base/command_line.h"
 #include "base/process/kill.h"
@@ skipping 34 matching lines @@
     scoped_ptr<base::MessageLoop> message_loop) {
   DCHECK(!test_client_name.empty());
   DCHECK(test_client_name_.empty());
   DCHECK(!message_loop_);
 
   test_client_name_ = test_client_name;
   message_loop_ = message_loop.Pass();
 }
 
 void IPCTestBase::CreateChannel(IPC::Listener* listener) {
-  CreateChannelFromChannelHandle(
-      GetChannelName(test_client_name_), listener);
+  CreateChannelFromChannelHandle(GetTestChannelHandle(), listener);
 }
 
 bool IPCTestBase::ConnectChannel() {
   CHECK(channel_.get());
   return channel_->Connect();
 }
 
 scoped_ptr<IPC::Channel> IPCTestBase::ReleaseChannel() {
   return channel_.Pass();
 }
@@ skipping 16 matching lines @@
   channel_ = CreateChannelFactory(
       channel_handle, task_runner().get())->BuildChannel(listener);
 }
 
 void IPCTestBase::CreateChannelProxy(
     IPC::Listener* listener,
     const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner) {
   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);
 }
 
 void IPCTestBase::DestroyChannelProxy() {
   CHECK(channel_proxy_.get());
   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);
+  client_process_ = SpawnChildWithOptions(GetTestMainName(), options);
+
+  return DidStartClient();
+}
+
+#elif defined(OS_WIN)
+
+bool IPCTestBase::StartClient() {
+  DCHECK_EQ(client_process_, base::kNullProcessHandle);
+  client_process_ = SpawnChild(GetTestMainName());
+  return DidStartClient();
+}
+
 #endif
 
-  return client_process_ != base::kNullProcessHandle;
-}
-
 bool IPCTestBase::WaitForClientShutdown() {
   DCHECK(client_process_ != base::kNullProcessHandle);
 
   bool rv = base::WaitForSingleProcess(client_process_,
                                        base::TimeDelta::FromSeconds(5));
   base::CloseProcessHandle(client_process_);
   client_process_ = base::kNullProcessHandle;
   return rv;
 }
 
+IPC::ChannelHandle IPCTestBase::GetTestChannelHandle() {
+  return GetChannelName(test_client_name_);
+}
+
 scoped_refptr<base::TaskRunner> IPCTestBase::task_runner() {
   return message_loop_->message_loop_proxy();
 }
 
 scoped_ptr<IPC::ChannelFactory> IPCTestBase::CreateChannelFactory(
     const IPC::ChannelHandle& handle,
     base::TaskRunner* runner) {
   return IPC::ChannelFactory::Create(handle, IPC::Channel::MODE_SERVER);
 }