ipc/ fixups for scoped_refptr operator T* removal.

BUG=110610 Review URL: https://codereview.chromium.org/535723002 Cr-Commit-Position: refs/heads/master@{#293170}
marcosholgado · Sep 3, 2014 · ff04843 · ff04843
1 parent 6087f97
commit ff04843
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/ipc/ipc_sync_channel.cc b/ipc/ipc_sync_channel.cc
@@ -448,7 +448,7 @@ SyncChannel::SyncChannel(
     : ChannelProxy(new SyncContext(listener, ipc_task_runner, shutdown_event)) {
   // The current (listener) thread must be distinct from the IPC thread, or else
   // 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();
 }
 

diff --git a/ipc/ipc_test_base.cc b/ipc/ipc_test_base.cc
@@ -83,7 +83,7 @@ void IPCTestBase::CreateChannelFromChannelHandle(
 
 void IPCTestBase::CreateChannelProxy(
     IPC::Listener* listener,
-    base::SingleThreadTaskRunner* ipc_task_runner) {
+    const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner) {
   CHECK(!channel_.get());
   CHECK(!channel_proxy_.get());
   channel_proxy_ = IPC::ChannelProxy::Create(GetChannelName(test_client_name_),

diff --git a/ipc/ipc_test_base.h b/ipc/ipc_test_base.h
@@ -61,8 +61,9 @@ class IPCTestBase : public base::MultiProcessTest {
   // channel proxy will automatically create and connect a channel.) You must
   // (manually) destroy the channel proxy before the task runner's thread is
   // destroyed.
-  void CreateChannelProxy(IPC::Listener* listener,
-                          base::SingleThreadTaskRunner* ipc_task_runner);
+  void CreateChannelProxy(
+      IPC::Listener* listener,
+      const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner);
   void DestroyChannelProxy();
 
   // Starts the client process, returning true if successful; this should be