diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 01:14:52 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 01:14:52 +0000 |
| commit | 6ecf2b9599dca0403a485cbf56bf6c9763681148 (patch) | |
| tree | d8c108a197067ff7d9af24c19a52dfcc6ee4f926 /net/socket/client_socket_handle.cc | |
| parent | bbf8a1c1044f290dea937d6fb53170fbbba0f899 (diff) | |
| download | chromium_src-6ecf2b9599dca0403a485cbf56bf6c9763681148.zip chromium_src-6ecf2b9599dca0403a485cbf56bf6c9763681148.tar.gz chromium_src-6ecf2b9599dca0403a485cbf56bf6c9763681148.tar.bz2 | |
base::Bind: Convert proxy_resolving_client_socket.[cc,h] and deps.
BUG=none
TEST=none
R=csilv
Review URL: http://codereview.chromium.org/8898036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_handle.cc')
| -rw-r--r-- | net/socket/client_socket_handle.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/socket/client_socket_handle.cc b/net/socket/client_socket_handle.cc index e093ec9..6d3e4e9 100644 --- a/net/socket/client_socket_handle.cc +++ b/net/socket/client_socket_handle.cc @@ -50,7 +50,7 @@ void ClientSocketHandle::ResetInternal(bool cancel) { is_initialized_ = false; group_name_.clear(); is_reused_ = false; - user_callback_ = NULL; + user_callback_.Reset(); if (layered_pool_) { pool_->RemoveLayeredPool(layered_pool_); layered_pool_ = NULL; @@ -92,10 +92,10 @@ void ClientSocketHandle::AddLayeredPool(LayeredPool* layered_pool) { } void ClientSocketHandle::OnIOComplete(int result) { - OldCompletionCallback* callback = user_callback_; - user_callback_ = NULL; + CompletionCallback callback = user_callback_; + user_callback_.Reset(); HandleInitCompletion(result); - callback->Run(result); + callback.Run(result); } void ClientSocketHandle::HandleInitCompletion(int result) { |