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

Unified Diff: net/ftp/ftp_network_transaction.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/base/net_log_event_type_list.h ('k') | net/http/http_network_transaction.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ftp/ftp_network_transaction.cc
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index 33f7dbad151af731529d81d977f75a875563e581..c9394551fa2adde2164827e734941180b6325e7d 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -616,8 +616,9 @@ int FtpNetworkTransaction::DoCtrlResolveHostComplete(int result) {
int FtpNetworkTransaction::DoCtrlConnect() {
next_state_ = STATE_CTRL_CONNECT_COMPLETE;
- ctrl_socket_.reset(socket_factory_->CreateTCPClientSocket(addresses_));
- return ctrl_socket_->Connect(&io_callback_, net_log_);
+ ctrl_socket_.reset(socket_factory_->CreateTCPClientSocket(
+ addresses_, net_log_.net_log()));
+ return ctrl_socket_->Connect(&io_callback_);
}
int FtpNetworkTransaction::DoCtrlConnectComplete(int result) {
@@ -1227,8 +1228,9 @@ int FtpNetworkTransaction::DoDataConnect() {
if (rv != OK)
return Stop(rv);
data_address.SetPort(data_connection_port_);
- data_socket_.reset(socket_factory_->CreateTCPClientSocket(data_address));
- return data_socket_->Connect(&io_callback_, net_log_);
+ data_socket_.reset(socket_factory_->CreateTCPClientSocket(
+ data_address, net_log_.net_log()));
+ return data_socket_->Connect(&io_callback_);
}
int FtpNetworkTransaction::DoDataConnectComplete(int result) {
« no previous file with comments | « net/base/net_log_event_type_list.h ('k') | net/http/http_network_transaction.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698