| 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 "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 | 6 |
| 7 #include "ipc/ipc_test_base.h" | 7 #include "ipc/ipc_test_base.h" |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/debug_on_start_win.h" | 10 #include "base/debug/debug_on_start_win.h" |
| 11 #include "base/process/kill.h" |
| 11 #include "base/threading/thread.h" | 12 #include "base/threading/thread.h" |
| 12 #include "base/time/time.h" | 13 #include "base/time/time.h" |
| 13 #include "ipc/ipc_descriptors.h" | 14 #include "ipc/ipc_descriptors.h" |
| 14 #include "ipc/ipc_switches.h" | 15 #include "ipc/ipc_switches.h" |
| 15 | 16 |
| 16 // static | 17 // static |
| 17 std::string IPCTestBase::GetChannelName(const std::string& test_client_name) { | 18 std::string IPCTestBase::GetChannelName(const std::string& test_client_name) { |
| 18 DCHECK(!test_client_name.empty()); | 19 DCHECK(!test_client_name.empty()); |
| 19 return test_client_name + "__Channel"; | 20 return test_client_name + "__Channel"; |
| 20 } | 21 } |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 | 114 |
| 114 bool IPCTestBase::WaitForClientShutdown() { | 115 bool IPCTestBase::WaitForClientShutdown() { |
| 115 DCHECK(client_process_ != base::kNullProcessHandle); | 116 DCHECK(client_process_ != base::kNullProcessHandle); |
| 116 | 117 |
| 117 bool rv = base::WaitForSingleProcess(client_process_, | 118 bool rv = base::WaitForSingleProcess(client_process_, |
| 118 base::TimeDelta::FromSeconds(5)); | 119 base::TimeDelta::FromSeconds(5)); |
| 119 base::CloseProcessHandle(client_process_); | 120 base::CloseProcessHandle(client_process_); |
| 120 client_process_ = base::kNullProcessHandle; | 121 client_process_ = base::kNullProcessHandle; |
| 121 return rv; | 122 return rv; |
| 122 } | 123 } |
| OLD | NEW |