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

Unified Diff: net/socket_stream/socket_stream.cc

Issue 344026: Add LoadLog to ClientSocket::Connect(). (Closed)
Patch Set: Minor build fixups and fixed mac bug. Created 11 years, 1 month 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/tcp_pinger.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 5744e7d18827918ddbcd2becfb3e306823f271f0..6ef8c331dd61b1fce340021a25967643221592ca 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -419,7 +419,8 @@ int SocketStream::DoTcpConnect() {
next_state_ = STATE_TCP_CONNECT_COMPLETE;
DCHECK(factory_);
socket_.reset(factory_->CreateTCPClientSocket(addresses_));
- return socket_->Connect(&io_callback_);
+ // TODO(willchan): Plumb LoadLog into SocketStream.
+ return socket_->Connect(&io_callback_, NULL);
}
int SocketStream::DoTcpConnectComplete(int result) {
@@ -626,7 +627,8 @@ int SocketStream::DoSOCKSConnect() {
else
s = new SOCKSClientSocket(s, req_info, host_resolver_.get());
socket_.reset(s);
- return socket_->Connect(&io_callback_);
+ // TODO(willchan): Plumb LoadLog into SocketStream.
+ return socket_->Connect(&io_callback_, NULL);
}
int SocketStream::DoSOCKSConnectComplete(int result) {
@@ -646,7 +648,8 @@ int SocketStream::DoSSLConnect() {
socket_.reset(factory_->CreateSSLClientSocket(
socket_.release(), url_.HostNoBrackets(), ssl_config_));
next_state_ = STATE_SSL_CONNECT_COMPLETE;
- return socket_->Connect(&io_callback_);
+ // TODO(willchan): Plumb LoadLog into SocketStream.
+ return socket_->Connect(&io_callback_, NULL);
}
int SocketStream::DoSSLConnectComplete(int result) {
« no previous file with comments | « net/socket/tcp_pinger.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698