summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_sync_message_filter.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-01 04:11:27 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-01 04:11:27 +0000
commit17571649651d6120d076184d69b57995ac35cd5f (patch)
treeba5ec42f82bff0cea4ef31e3f4da76da52fe410f /ipc/ipc_sync_message_filter.cc
parentc7abcfd801f306f116db616ead3e725cd8d89b79 (diff)
downloadchromium_src-17571649651d6120d076184d69b57995ac35cd5f.zip
chromium_src-17571649651d6120d076184d69b57995ac35cd5f.tar.gz
chromium_src-17571649651d6120d076184d69b57995ac35cd5f.tar.bz2
Update ipc/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes BUG=110610 TBR=darin Review URL: https://chromiumcodereview.appspot.com/15703006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_sync_message_filter.cc')
-rw-r--r--ipc/ipc_sync_message_filter.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ipc/ipc_sync_message_filter.cc b/ipc/ipc_sync_message_filter.cc
index b2cd8a7..cd0e72c 100644
--- a/ipc/ipc_sync_message_filter.cc
+++ b/ipc/ipc_sync_message_filter.cc
@@ -24,7 +24,7 @@ SyncMessageFilter::SyncMessageFilter(base::WaitableEvent* shutdown_event)
bool SyncMessageFilter::Send(Message* message) {
{
base::AutoLock auto_lock(lock_);
- if (!io_loop_) {
+ if (!io_loop_.get()) {
delete message;
return false;
}
@@ -46,8 +46,8 @@ bool SyncMessageFilter::Send(Message* message) {
base::AutoLock auto_lock(lock_);
// Can't use this class on the main thread or else it can lead to deadlocks.
// Also by definition, can't use this on IO thread since we're blocking it.
- DCHECK(MessageLoopProxy::current() != listener_loop_);
- DCHECK(MessageLoopProxy::current() != io_loop_);
+ DCHECK(MessageLoopProxy::current() != listener_loop_.get());
+ DCHECK(MessageLoopProxy::current() != io_loop_.get());
pending_sync_messages_.insert(&pending_message);
}