summaryrefslogtreecommitdiffstats
path: root/net/socket_stream
diff options
context:
space:
mode:
Diffstat (limited to 'net/socket_stream')
-rw-r--r--net/socket_stream/socket_stream.cc4
-rw-r--r--net/socket_stream/socket_stream.h3
2 files changed, 2 insertions, 5 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index 0e9f6b0..22600af 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) {
diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
index 663091a..1e0d6e4 100644
--- a/net/socket_stream/socket_stream.h
+++ b/net/socket_stream/socket_stream.h
@@ -336,8 +336,7 @@ class NET_EXPORT SocketStream
SSLConfig server_ssl_config_;
SSLConfig proxy_ssl_config_;
- const CompletionCallback io_callback_;
- OldCompletionCallbackImpl<SocketStream> io_callback_old_;
+ CompletionCallback io_callback_;
scoped_refptr<IOBuffer> read_buf_;
int read_buf_size_;