Commit ff04843f authored by dcheng's avatar dcheng Committed by Commit bot

ipc/ fixups for scoped_refptr operator T* removal.

BUG=110610

Review URL: https://codereview.chromium.org/535723002

Cr-Commit-Position: refs/heads/master@{#293170}
parent 6087f972
...@@ -448,7 +448,7 @@ SyncChannel::SyncChannel( ...@@ -448,7 +448,7 @@ SyncChannel::SyncChannel(
: ChannelProxy(new SyncContext(listener, ipc_task_runner, shutdown_event)) { : ChannelProxy(new SyncContext(listener, ipc_task_runner, shutdown_event)) {
// The current (listener) thread must be distinct from the IPC thread, or else // The current (listener) thread must be distinct from the IPC thread, or else
// sending synchronous messages will deadlock. // sending synchronous messages will deadlock.
DCHECK_NE(ipc_task_runner, base::ThreadTaskRunnerHandle::Get().get()); DCHECK_NE(ipc_task_runner.get(), base::ThreadTaskRunnerHandle::Get().get());
StartWatching(); StartWatching();
} }
......
...@@ -83,7 +83,7 @@ void IPCTestBase::CreateChannelFromChannelHandle( ...@@ -83,7 +83,7 @@ void IPCTestBase::CreateChannelFromChannelHandle(
void IPCTestBase::CreateChannelProxy( void IPCTestBase::CreateChannelProxy(
IPC::Listener* listener, IPC::Listener* listener,
base::SingleThreadTaskRunner* ipc_task_runner) { const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner) {
CHECK(!channel_.get()); CHECK(!channel_.get());
CHECK(!channel_proxy_.get()); CHECK(!channel_proxy_.get());
channel_proxy_ = IPC::ChannelProxy::Create(GetChannelName(test_client_name_), channel_proxy_ = IPC::ChannelProxy::Create(GetChannelName(test_client_name_),
......
...@@ -61,8 +61,9 @@ class IPCTestBase : public base::MultiProcessTest { ...@@ -61,8 +61,9 @@ class IPCTestBase : public base::MultiProcessTest {
// channel proxy will automatically create and connect a channel.) You must // channel proxy will automatically create and connect a channel.) You must
// (manually) destroy the channel proxy before the task runner's thread is // (manually) destroy the channel proxy before the task runner's thread is
// destroyed. // destroyed.
void CreateChannelProxy(IPC::Listener* listener, void CreateChannelProxy(
base::SingleThreadTaskRunner* ipc_task_runner); IPC::Listener* listener,
const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner);
void DestroyChannelProxy(); void DestroyChannelProxy();
// Starts the client process, returning true if successful; this should be // Starts the client process, returning true if successful; this should be
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment