diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 07:03:53 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 07:03:53 +0000 |
| commit | 9e743cddfd631038fe6f1cdde050e18d61319ec6 (patch) | |
| tree | 7ef974e43b23f570433fe819bcd07966165c517f /net/ftp/ftp_network_transaction.cc | |
| parent | 2e7aff66fe443c29b2fc14a776dca5512b0b4729 (diff) | |
| download | chromium_src-9e743cddfd631038fe6f1cdde050e18d61319ec6.zip chromium_src-9e743cddfd631038fe6f1cdde050e18d61319ec6.tar.gz chromium_src-9e743cddfd631038fe6f1cdde050e18d61319ec6.tar.bz2 | |
Generalize the net module's LoadLog facility from a passive container, to an event stream (NetLog).
This makes it possible to associate a single NetLog with a URLRequestContext, and then attach observers to that log to watch the stream of events.
This changelist attempts to do the most direct translation, so there will be subsequent iterations to clean up.
The user-visible behavior should remain unchanged.
BUG=37421
Review URL: http://codereview.chromium.org/848006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ftp/ftp_network_transaction.cc')
| -rw-r--r-- | net/ftp/ftp_network_transaction.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc index 64bd320..b244009 100644 --- a/net/ftp/ftp_network_transaction.cc +++ b/net/ftp/ftp_network_transaction.cc @@ -10,8 +10,8 @@ #include "base/utf_string_conversions.h" #include "net/base/connection_type_histograms.h" #include "net/base/escape.h" -#include "net/base/load_log.h" #include "net/base/net_errors.h" +#include "net/base/net_log.h" #include "net/base/net_util.h" #include "net/ftp/ftp_network_session.h" #include "net/ftp/ftp_request_info.h" @@ -73,8 +73,8 @@ FtpNetworkTransaction::~FtpNetworkTransaction() { int FtpNetworkTransaction::Start(const FtpRequestInfo* request_info, CompletionCallback* callback, - LoadLog* load_log) { - load_log_ = load_log; + const BoundNetLog& net_log) { + net_log_ = net_log; request_ = request_info; if (request_->url.has_username()) { @@ -508,7 +508,7 @@ int FtpNetworkTransaction::DoCtrlResolveHost() { // RFC 2428, we have to turn off IPv6 in FTP. See http://crbug.com/32945. info.set_address_family(ADDRESS_FAMILY_IPV4); // No known referrer. - return resolver_.Resolve(info, &addresses_, &io_callback_, load_log_); + return resolver_.Resolve(info, &addresses_, &io_callback_, net_log_); } int FtpNetworkTransaction::DoCtrlResolveHostComplete(int result) { @@ -520,7 +520,7 @@ 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_, load_log_); + return ctrl_socket_->Connect(&io_callback_, net_log_); } int FtpNetworkTransaction::DoCtrlConnectComplete(int result) { @@ -1119,7 +1119,7 @@ int FtpNetworkTransaction::DoDataConnect() { return Stop(rv); data_address.SetPort(data_connection_port_); data_socket_.reset(socket_factory_->CreateTCPClientSocket(data_address)); - return data_socket_->Connect(&io_callback_, load_log_); + return data_socket_->Connect(&io_callback_, net_log_); } int FtpNetworkTransaction::DoDataConnectComplete(int result) { |