Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(937)

Unified Diff: net/socket/client_socket_handle.cc

Issue 8898036: base::Bind: Convert proxy_resolving_client_socket.[cc,h] and deps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Possible test fix. Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/client_socket_handle.h ('k') | net/socket/client_socket_pool_base_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_handle.cc
diff --git a/net/socket/client_socket_handle.cc b/net/socket/client_socket_handle.cc
index e093ec97b7ece113d19c1038e3fa0f74efb70c9e..6d3e4e9a90caf3d98a899d8870e2b528b8914a25 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) {
« no previous file with comments | « net/socket/client_socket_handle.h ('k') | net/socket/client_socket_pool_base_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698