summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_sync_channel_unittest.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 16:46:36 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 16:46:36 +0000
commitcadac62e5c2b9f5fef59ce0326bb2cd79ffbe622 (patch)
tree7b95f103fce509de887c8c5e643604855b57c0ba /ipc/ipc_sync_channel_unittest.cc
parent9f6e673c7f43f6ee414f72a74585dad8ebaceec3 (diff)
downloadchromium_src-cadac62e5c2b9f5fef59ce0326bb2cd79ffbe622.zip
chromium_src-cadac62e5c2b9f5fef59ce0326bb2cd79ffbe622.tar.gz
chromium_src-cadac62e5c2b9f5fef59ce0326bb2cd79ffbe622.tar.bz2
Call scoped_refptr<T>::get() rather than relying on implicit "operator T*"
This upates calls to bound temporary objects to also use get(). While it has the same semantic equivalence to the existing code, this generally represents a dangerous pattern - indeed, part of the whole motivation for this change is to make this anti-pattern very visible to authors. This change simply updates all of the call sites, to allow the "operator T*" to be removed and preventing new instances. The existing instances will then be reviewed for "suspicious" changes and updated to use/pass scoped_refptr<T> rather than T*, as appropriate. BUG=110610 TBR=darin Review URL: https://codereview.chromium.org/15984016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_sync_channel_unittest.cc')
-rw-r--r--ipc/ipc_sync_channel_unittest.cc43
1 files changed, 29 insertions, 14 deletions
diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc
index f71f874..bd13089 100644
--- a/ipc/ipc_sync_channel_unittest.cc
+++ b/ipc/ipc_sync_channel_unittest.cc
@@ -154,9 +154,12 @@ class Worker : public Listener, public Sender {
}
virtual SyncChannel* CreateChannel() {
- return new SyncChannel(
- channel_name_, mode_, this, ipc_thread_.message_loop_proxy(), true,
- &shutdown_event_);
+ return new SyncChannel(channel_name_,
+ mode_,
+ this,
+ ipc_thread_.message_loop_proxy().get(),
+ true,
+ &shutdown_event_);
}
base::Thread* ListenerThread() {
@@ -325,7 +328,7 @@ class TwoStepServer : public Worker {
virtual SyncChannel* CreateChannel() OVERRIDE {
SyncChannel* channel = new SyncChannel(
- this, ipc_thread().message_loop_proxy(), shutdown_event());
+ this, ipc_thread().message_loop_proxy().get(), shutdown_event());
channel->Init(channel_name(), mode(), create_pipe_now_);
return channel;
}
@@ -346,7 +349,7 @@ class TwoStepClient : public Worker {
virtual SyncChannel* CreateChannel() OVERRIDE {
SyncChannel* channel = new SyncChannel(
- this, ipc_thread().message_loop_proxy(), shutdown_event());
+ this, ipc_thread().message_loop_proxy().get(), shutdown_event());
channel->Init(channel_name(), mode(), create_pipe_now_);
return channel;
}
@@ -1242,9 +1245,13 @@ class RestrictedDispatchClient : public Worker {
else
LOG(ERROR) << "Send failed to dispatch incoming message on same channel";
- non_restricted_channel_.reset(new SyncChannel(
- "non_restricted_channel", Channel::MODE_CLIENT, this,
- ipc_thread().message_loop_proxy(), true, shutdown_event()));
+ non_restricted_channel_.reset(
+ new SyncChannel("non_restricted_channel",
+ Channel::MODE_CLIENT,
+ this,
+ ipc_thread().message_loop_proxy().get(),
+ true,
+ shutdown_event()));
server_->ListenerThread()->message_loop()->PostTask(
FROM_HERE, base::Bind(&RestrictedDispatchServer::OnDoPing, server_, 2));
@@ -1630,9 +1637,13 @@ class RestrictedDispatchPipeWorker : public Worker {
if (is_first())
event1_->Signal();
event2_->Wait();
- other_channel_.reset(new SyncChannel(
- other_channel_name_, Channel::MODE_CLIENT, this,
- ipc_thread().message_loop_proxy(), true, shutdown_event()));
+ other_channel_.reset(
+ new SyncChannel(other_channel_name_,
+ Channel::MODE_CLIENT,
+ this,
+ ipc_thread().message_loop_proxy().get(),
+ true,
+ shutdown_event()));
other_channel_->SetRestrictDispatchChannelGroup(group_);
if (!is_first()) {
event1_->Signal();
@@ -1706,9 +1717,13 @@ class ReentrantReplyServer1 : public Worker {
server_ready_(server_ready) { }
virtual void Run() OVERRIDE {
- server2_channel_.reset(new SyncChannel(
- "reentrant_reply2", Channel::MODE_CLIENT, this,
- ipc_thread().message_loop_proxy(), true, shutdown_event()));
+ server2_channel_.reset(
+ new SyncChannel("reentrant_reply2",
+ Channel::MODE_CLIENT,
+ this,
+ ipc_thread().message_loop_proxy().get(),
+ true,
+ shutdown_event()));
server_ready_->Signal();
Message* msg = new SyncChannelTestMsg_Reentrant1();
server2_channel_->Send(msg);