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

Unified Diff: net/socket_stream/socket_stream.cc

Issue 1696005: Add net log entries that summarize transmit and receive byte counts. (Closed)
Patch Set: More tests and address comments Created 10 years, 8 months 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') | net/spdy/spdy_session.cc » ('j') | 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 8a78659e25ba130087686d17cf4580ab9cfcfc24..550057964bc45960a46383bf50e4ebf87df2d63c 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -499,9 +499,10 @@ int SocketStream::DoResolveHostComplete(int result) {
int SocketStream::DoTcpConnect() {
next_state_ = STATE_TCP_CONNECT_COMPLETE;
DCHECK(factory_);
- socket_.reset(factory_->CreateTCPClientSocket(addresses_));
+ socket_.reset(factory_->CreateTCPClientSocket(addresses_,
+ net_log_.net_log()));
metrics_->OnStartConnection();
- return socket_->Connect(&io_callback_, net_log_);
+ return socket_->Connect(&io_callback_);
}
int SocketStream::DoTcpConnectComplete(int result) {
@@ -717,7 +718,7 @@ int SocketStream::DoSOCKSConnect() {
s = new SOCKSClientSocket(s, req_info, host_resolver_.get());
socket_.reset(s);
metrics_->OnSOCKSProxy();
- return socket_->Connect(&io_callback_, net_log_);
+ return socket_->Connect(&io_callback_);
}
int SocketStream::DoSOCKSConnectComplete(int result) {
@@ -740,7 +741,7 @@ int SocketStream::DoSSLConnect() {
socket_.release(), url_.HostNoBrackets(), ssl_config_));
next_state_ = STATE_SSL_CONNECT_COMPLETE;
metrics_->OnSSLConnection();
- return socket_->Connect(&io_callback_, net_log_);
+ return socket_->Connect(&io_callback_);
}
int SocketStream::DoSSLConnectComplete(int result) {
« no previous file with comments | « net/socket/tcp_pinger.h ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698