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_channel_proxy.h | |
| 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_channel_proxy.h')
| -rw-r--r-- | ipc/ipc_channel_proxy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/ipc_channel_proxy.h b/ipc/ipc_channel_proxy.h index 6fbbc2a..4d5a7d4 100644 --- a/ipc/ipc_channel_proxy.h +++ b/ipc/ipc_channel_proxy.h @@ -197,7 +197,7 @@ class IPC_EXPORT ChannelProxy : public Sender, public base::NonThreadSafe { Context(Listener* listener, base::SingleThreadTaskRunner* ipc_thread); void ClearIPCTaskRunner(); base::SingleThreadTaskRunner* ipc_task_runner() const { - return ipc_task_runner_; + return ipc_task_runner_.get(); } const std::string& channel_id() const { return channel_id_; } @@ -268,7 +268,7 @@ class IPC_EXPORT ChannelProxy : public Sender, public base::NonThreadSafe { base::ProcessId peer_pid_; }; - Context* context() { return context_; } + Context* context() { return context_.get(); } OutgoingMessageFilter* outgoing_message_filter() { return outgoing_message_filter_; |