diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-01 04:11:27 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-01 04:11:27 +0000 |
commit | 17571649651d6120d076184d69b57995ac35cd5f (patch) | |
tree | ba5ec42f82bff0cea4ef31e3f4da76da52fe410f /ipc/ipc_sync_channel.cc | |
parent | c7abcfd801f306f116db616ead3e725cd8d89b79 (diff) | |
download | chromium_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_channel.cc')
-rw-r--r-- | ipc/ipc_sync_channel.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipc/ipc_sync_channel.cc b/ipc/ipc_sync_channel.cc index 50d48ea..491b72d 100644 --- a/ipc/ipc_sync_channel.cc +++ b/ipc/ipc_sync_channel.cc @@ -133,7 +133,7 @@ class SyncChannel::ReceivedSyncMsgQueue : SyncMessageQueue::iterator iter = message_queue_.begin(); while (iter != message_queue_.end()) { - if (iter->context == context) { + if (iter->context.get() == context) { delete iter->message; iter = message_queue_.erase(iter); message_queue_version_++; @@ -150,7 +150,7 @@ class SyncChannel::ReceivedSyncMsgQueue : WaitableEvent* dispatch_event() { return &dispatch_event_; } base::SingleThreadTaskRunner* listener_task_runner() { - return listener_task_runner_; + return listener_task_runner_.get(); } // Holds a pointer to the per-thread ReceivedSyncMsgQueue object. @@ -483,7 +483,7 @@ bool SyncChannel::SendWithTimeout(Message* message, int timeout_ms) { // Wait for reply, or for any other incoming synchronous messages. // *this* might get deleted, so only call static functions at this point. - WaitForReply(context, pump_messages_event); + WaitForReply(context.get(), pump_messages_event); return context->Pop(); } |