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

Unified Diff: net/socket_stream/socket_stream.cc

Issue 8985012: base::Bind: Convert net/proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: One more include. 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_stream/socket_stream.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket_stream/socket_stream.cc
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index 0e9f6b0a2a9554d5e0613f26d10fc6fb4034ab8f..22600af85727126a4bcfeafc8b002836d5d01e91 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -69,8 +69,6 @@ SocketStream::SocketStream(const GURL& url, Delegate* delegate)
ALLOW_THIS_IN_INITIALIZER_LIST(
io_callback_(base::Bind(&SocketStream::OnIOCompleted,
base::Unretained(this)))),
- ALLOW_THIS_IN_INITIALIZER_LIST(
- io_callback_old_(this, &SocketStream::OnIOCompleted)),
read_buf_(NULL),
write_buf_(NULL),
current_write_buf_(NULL),
@@ -551,7 +549,7 @@ int SocketStream::DoResolveProxy() {
// Alternate-Protocol header here for ws:// or TLS NPN extension for wss:// .
return proxy_service()->ResolveProxy(
- proxy_url_, &proxy_info_, &io_callback_old_, &pac_request_, net_log_);
+ proxy_url_, &proxy_info_, io_callback_, &pac_request_, net_log_);
}
int SocketStream::DoResolveProxyComplete(int result) {
« no previous file with comments | « net/socket_stream/socket_stream.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698