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/process/kill.h" | 10 #include "base/process/kill.h" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 void IPCTestBase::DestroyChannel() { | 62 void IPCTestBase::DestroyChannel() { |
63 DCHECK(channel_.get()); | 63 DCHECK(channel_.get()); |
64 channel_.reset(); | 64 channel_.reset(); |
65 } | 65 } |
66 | 66 |
67 void IPCTestBase::CreateChannelFromChannelHandle( | 67 void IPCTestBase::CreateChannelFromChannelHandle( |
68 const IPC::ChannelHandle& channel_handle, | 68 const IPC::ChannelHandle& channel_handle, |
69 IPC::Listener* listener) { | 69 IPC::Listener* listener) { |
70 CHECK(!channel_.get()); | 70 CHECK(!channel_.get()); |
71 CHECK(!channel_proxy_.get()); | 71 CHECK(!channel_proxy_.get()); |
72 channel_.reset(new IPC::Channel(channel_handle, | 72 channel_ = IPC::Channel::CreateServer(channel_handle, listener); |
73 IPC::Channel::MODE_SERVER, | |
74 listener)); | |
75 } | 73 } |
76 | 74 |
77 void IPCTestBase::CreateChannelProxy( | 75 void IPCTestBase::CreateChannelProxy( |
78 IPC::Listener* listener, | 76 IPC::Listener* listener, |
79 base::SingleThreadTaskRunner* ipc_task_runner) { | 77 base::SingleThreadTaskRunner* ipc_task_runner) { |
80 CHECK(!channel_.get()); | 78 CHECK(!channel_.get()); |
81 CHECK(!channel_proxy_.get()); | 79 CHECK(!channel_proxy_.get()); |
82 channel_proxy_.reset(new IPC::ChannelProxy(GetChannelName(test_client_name_), | 80 channel_proxy_.reset(new IPC::ChannelProxy(GetChannelName(test_client_name_), |
83 IPC::Channel::MODE_SERVER, | 81 IPC::Channel::MODE_SERVER, |
84 listener, | 82 listener, |
(...skipping 29 matching lines...) Expand all Loading... |
114 | 112 |
115 bool IPCTestBase::WaitForClientShutdown() { | 113 bool IPCTestBase::WaitForClientShutdown() { |
116 DCHECK(client_process_ != base::kNullProcessHandle); | 114 DCHECK(client_process_ != base::kNullProcessHandle); |
117 | 115 |
118 bool rv = base::WaitForSingleProcess(client_process_, | 116 bool rv = base::WaitForSingleProcess(client_process_, |
119 base::TimeDelta::FromSeconds(5)); | 117 base::TimeDelta::FromSeconds(5)); |
120 base::CloseProcessHandle(client_process_); | 118 base::CloseProcessHandle(client_process_); |
121 client_process_ = base::kNullProcessHandle; | 119 client_process_ = base::kNullProcessHandle; |
122 return rv; | 120 return rv; |
123 } | 121 } |
OLD | NEW |