diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 23:25:19 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 23:25:19 +0000 |
| commit | 5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf (patch) | |
| tree | 4f39f1f44be3eb179f8368bca0bc18512e398a40 /net/socket_stream | |
| parent | f852667f469ea8fd31b8a1dd0f0130382efe591f (diff) | |
| download | chromium_src-5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf.zip chromium_src-5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf.tar.gz chromium_src-5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf.tar.bz2 | |
Add LoadLog to ClientSocket::Connect().
TODO: Use LoadLog in FLIP code.
Review URL: http://codereview.chromium.org/344026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
| -rw-r--r-- | net/socket_stream/socket_stream.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index 5744e7d..6ef8c33 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) { |