| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/utility/importer/firefox_importer_unittest_utils.h" | 5 #include "chrome/utility/importer/firefox_importer_unittest_utils.h" |
| 6 | 6 |
| 7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| 11 #include "base/files/file_util.h" | 11 #include "base/files/file_util.h" |
| 12 #include "base/files/scoped_file.h" | 12 #include "base/files/scoped_file.h" |
| 13 #include "base/location.h" | 13 #include "base/location.h" |
| 14 #include "base/message_loop/message_loop.h" | 14 #include "base/message_loop/message_loop.h" |
| 15 #include "base/posix/global_descriptors.h" | 15 #include "base/posix/global_descriptors.h" |
| 16 #include "base/process/kill.h" | 16 #include "base/process/kill.h" |
| 17 #include "base/process/launch.h" | 17 #include "base/process/launch.h" |
| 18 #include "base/run_loop.h" |
| 18 #include "base/single_thread_task_runner.h" | 19 #include "base/single_thread_task_runner.h" |
| 19 #include "base/test/test_timeouts.h" | 20 #include "base/test/test_timeouts.h" |
| 20 #include "base/threading/thread_task_runner_handle.h" | 21 #include "base/threading/thread_task_runner_handle.h" |
| 21 #include "chrome/common/importer/firefox_importer_utils.h" | 22 #include "chrome/common/importer/firefox_importer_utils.h" |
| 22 #include "ipc/ipc_channel.h" | 23 #include "ipc/ipc_channel.h" |
| 23 #include "ipc/ipc_descriptors.h" | 24 #include "ipc/ipc_descriptors.h" |
| 24 #include "ipc/ipc_listener.h" | 25 #include "ipc/ipc_listener.h" |
| 25 #include "ipc/ipc_message.h" | 26 #include "ipc/ipc_message.h" |
| 26 #include "ipc/ipc_multiprocess_test.h" | 27 #include "ipc/ipc_multiprocess_test.h" |
| 27 #include "testing/multiprocess_func_list.h" | 28 #include "testing/multiprocess_func_list.h" |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 MULTIPROCESS_IPC_TEST_MAIN(NSSDecrypterChildProcess) { | 286 MULTIPROCESS_IPC_TEST_MAIN(NSSDecrypterChildProcess) { |
| 286 base::MessageLoopForIO main_message_loop; | 287 base::MessageLoopForIO main_message_loop; |
| 287 FFDecryptorClientChannelListener listener; | 288 FFDecryptorClientChannelListener listener; |
| 288 | 289 |
| 289 std::unique_ptr<IPC::Channel> channel = | 290 std::unique_ptr<IPC::Channel> channel = |
| 290 IPC::Channel::CreateClient(kTestChannelID, &listener); | 291 IPC::Channel::CreateClient(kTestChannelID, &listener); |
| 291 CHECK(channel->Connect()); | 292 CHECK(channel->Connect()); |
| 292 listener.SetSender(channel.get()); | 293 listener.SetSender(channel.get()); |
| 293 | 294 |
| 294 // run message loop | 295 // run message loop |
| 295 base::MessageLoop::current()->Run(); | 296 base::RunLoop().Run(); |
| 296 | 297 |
| 297 return 0; | 298 return 0; |
| 298 } | 299 } |
| OLD | NEW |