Stop linking in the old Mojo EDK.

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 "ipc/ipc_test_base.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/process/kill.h"
@@ skipping 63 matching lines @@
   DCHECK(channel_.get());
   channel_.reset();
 }
 
 void IPCTestBase::CreateChannelFromChannelHandle(
     const IPC::ChannelHandle& channel_handle,
     IPC::Listener* listener) {
   CHECK(!channel_.get());
   CHECK(!channel_proxy_.get());
   channel_ = CreateChannelFactory(
-      channel_handle, task_runner().get())->BuildChannel(listener);
+      channel_handle, io_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(GetTestChannelHandle(), ipc_task_runner.get()),
       listener, ipc_task_runner);
@@ skipping 23 matching lines @@
 
 bool IPCTestBase::StartClientWithFD(int ipcfd) {
   DCHECK(!client_process_.IsValid());
 
   base::FileHandleMappingVector fds_to_map;
   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;
+  AboutToSpawnChild(&options);
   client_process_ = SpawnChildWithOptions(GetTestMainName(), options);
 
   return DidStartClient();
 }
 
 #elif defined(OS_WIN)
 
 bool IPCTestBase::StartClient() {
   DCHECK(!client_process_.IsValid());
-  client_process_ = SpawnChild(GetTestMainName());
+  base::LaunchOptions options;
+  base::HandlesToInheritVector handles_to_inherit;
+  options.handles_to_inherit = &handles_to_inherit;
+  AboutToSpawnChild(&options);
+  client_process_ = SpawnChildWithOptions(GetTestMainName(), options);
   return DidStartClient();
 }
 
 #endif
 
 bool IPCTestBase::WaitForClientShutdown() {
   DCHECK(client_process_.IsValid());
 
   int exit_code;
   bool rv = client_process_.WaitForExitWithTimeout(
       base::TimeDelta::FromSeconds(5), &exit_code);
   client_process_.Close();
   return rv;
 }
 
 IPC::ChannelHandle IPCTestBase::GetTestChannelHandle() {
   return GetChannelName(test_client_name_);
 }
 
-scoped_refptr<base::SequencedTaskRunner> IPCTestBase::task_runner() {
+scoped_refptr<base::TaskRunner> IPCTestBase::io_task_runner() {
   return message_loop_->task_runner();
 }
 
 scoped_ptr<IPC::ChannelFactory> IPCTestBase::CreateChannelFactory(
     const IPC::ChannelHandle& handle,
-    base::SequencedTaskRunner* runner) {
+    base::TaskRunner* runner) {
   return IPC::ChannelFactory::Create(handle, IPC::Channel::MODE_SERVER);
 }