diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:13:46 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:13:46 +0000 |
| commit | fc72bb18b111ff63e57135d97de6d59291f3b7b8 (patch) | |
| tree | f7fedf0a0577e38a0486e8bdc88a47a508bf122d /content/renderer/p2p | |
| parent | 7cd76fded67d66fb8ea4f5abce5241ad71d749a9 (diff) | |
| download | chromium_src-fc72bb18b111ff63e57135d97de6d59291f3b7b8.zip chromium_src-fc72bb18b111ff63e57135d97de6d59291f3b7b8.tar.gz chromium_src-fc72bb18b111ff63e57135d97de6d59291f3b7b8.tar.bz2 | |
Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/16294003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/p2p')
| -rw-r--r-- | content/renderer/p2p/port_allocator.cc | 4 | ||||
| -rw-r--r-- | content/renderer/p2p/socket_client.cc | 4 | ||||
| -rw-r--r-- | content/renderer/p2p/socket_dispatcher.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc index 77ac0ef..a76911b 100644 --- a/content/renderer/p2p/port_allocator.cc +++ b/content/renderer/p2p/port_allocator.cc @@ -108,7 +108,7 @@ P2PPortAllocatorSession::P2PPortAllocatorSession( } P2PPortAllocatorSession::~P2PPortAllocatorSession() { - if (stun_address_request_) + if (stun_address_request_.get()) stun_address_request_->Cancel(); } @@ -155,7 +155,7 @@ void P2PPortAllocatorSession::GetPortConfigurations() { } void P2PPortAllocatorSession::ResolveStunServerAddress() { - if (stun_address_request_) + if (stun_address_request_.get()) return; stun_address_request_ = diff --git a/content/renderer/p2p/socket_client.cc b/content/renderer/p2p/socket_client.cc index ed3f211..490ebee 100644 --- a/content/renderer/p2p/socket_client.cc +++ b/content/renderer/p2p/socket_client.cc @@ -111,7 +111,7 @@ void P2PSocketClient::OnIncomingTcpConnection(const net::IPEndPoint& address) { DCHECK_EQ(state_, STATE_OPEN); scoped_refptr<P2PSocketClient> new_client = new P2PSocketClient(dispatcher_); - new_client->socket_id_ = dispatcher_->RegisterClient(new_client); + new_client->socket_id_ = dispatcher_->RegisterClient(new_client.get()); new_client->state_ = STATE_OPEN; new_client->delegate_message_loop_ = delegate_message_loop_; @@ -127,7 +127,7 @@ void P2PSocketClient::DeliverOnIncomingTcpConnection( const net::IPEndPoint& address, scoped_refptr<P2PSocketClient> new_client) { DCHECK(delegate_message_loop_->BelongsToCurrentThread()); if (delegate_) { - delegate_->OnIncomingTcpConnection(address, new_client); + delegate_->OnIncomingTcpConnection(address, new_client.get()); } else { // Just close the socket if there is no delegate to accept it. new_client->Close(); diff --git a/content/renderer/p2p/socket_dispatcher.cc b/content/renderer/p2p/socket_dispatcher.cc index 7fe71ee..7bb7444 100644 --- a/content/renderer/p2p/socket_dispatcher.cc +++ b/content/renderer/p2p/socket_dispatcher.cc @@ -85,7 +85,7 @@ void P2PSocketDispatcher::OnChannelClosing() { } base::MessageLoopProxy* P2PSocketDispatcher::message_loop() { - return message_loop_; + return message_loop_.get(); } int P2PSocketDispatcher::RegisterClient(P2PSocketClient* client) { |