LoadLog is used as an output parameter, reorder it to the last parameter.

Review URL: http://codereview.chromium.org/164531

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23419 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 13 insertions, 13 deletions

diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index b5b06fe..ef896b8 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -50,9 +50,9 @@ FtpNetworkTransaction::FtpNetworkTransaction(
 FtpNetworkTransaction::~FtpNetworkTransaction() {
 }
 
-int FtpNetworkTransaction::Start(LoadLog* load_log,
-                                 const FtpRequestInfo* request_info,
-                                 CompletionCallback* callback) {
+int FtpNetworkTransaction::Start(const FtpRequestInfo* request_info,
+                                 CompletionCallback* callback,
+                                 LoadLog* load_log) {
   load_log_ = load_log;
   request_ = request_info;
 
@@ -410,7 +410,7 @@ int FtpNetworkTransaction::DoCtrlResolveHost() {
 
   HostResolver::RequestInfo info(host, port);
   // No known referrer.
-  return resolver_.Resolve(load_log_, info, &addresses_, &io_callback_);
+  return resolver_.Resolve(info, &addresses_, &io_callback_, load_log_);
 }
 
 int FtpNetworkTransaction::DoCtrlResolveHostComplete(int result) {
@@ -935,7 +935,7 @@ int FtpNetworkTransaction::DoDataResolveHost() {
   HostResolver::RequestInfo info(data_connection_ip_,
                                  data_connection_port_);
   // No known referrer.
-  return resolver_.Resolve(load_log_, info, &addresses_, &io_callback_);
+  return resolver_.Resolve(info, &addresses_, &io_callback_, load_log_);
 }
 
 int FtpNetworkTransaction::DoDataResolveHostComplete(int result) {
diff --git a/net/ftp/ftp_network_transaction.h b/net/ftp/ftp_network_transaction.h
index 1a9c521f..447d271 100644
--- a/net/ftp/ftp_network_transaction.h
+++ b/net/ftp/ftp_network_transaction.h
@@ -31,9 +31,9 @@ class FtpNetworkTransaction : public FtpTransaction {
   virtual ~FtpNetworkTransaction();
 
   // FtpTransaction methods:
-  virtual int Start(LoadLog* load_log,
-                    const FtpRequestInfo* request_info,
-                    CompletionCallback* callback);
+  virtual int Start(const FtpRequestInfo* request_info,
+                    CompletionCallback* callback,
+                    LoadLog* load_log);
   virtual int Stop(int error);
   virtual int RestartWithAuth(const std::wstring& username,
                               const std::wstring& password,
diff --git a/net/ftp/ftp_network_transaction_unittest.cc b/net/ftp/ftp_network_transaction_unittest.cc
index 9ee5d50..032227e 100644
--- a/net/ftp/ftp_network_transaction_unittest.cc
+++ b/net/ftp/ftp_network_transaction_unittest.cc
@@ -311,7 +311,7 @@ class FtpNetworkTransactionTest : public PlatformTest {
     FtpRequestInfo request_info = GetRequestInfo(request);
     EXPECT_EQ(LOAD_STATE_IDLE, transaction_.GetLoadState());
     ASSERT_EQ(ERR_IO_PENDING,
-              transaction_.Start(NULL, &request_info, &callback_));
+              transaction_.Start(&request_info, &callback_, NULL));
     EXPECT_NE(LOAD_STATE_IDLE, transaction_.GetLoadState());
     EXPECT_EQ(expected_result, callback_.WaitForResult());
     EXPECT_EQ(FtpMockControlSocket::QUIT, ctrl_socket->state());
@@ -349,7 +349,7 @@ TEST_F(FtpNetworkTransactionTest, FailedLookup) {
   host_resolver_->rules()->AddSimulatedFailure("badhost");
   EXPECT_EQ(LOAD_STATE_IDLE, transaction_.GetLoadState());
   ASSERT_EQ(ERR_IO_PENDING,
-            transaction_.Start(NULL, &request_info, &callback_));
+            transaction_.Start(&request_info, &callback_, NULL));
   EXPECT_EQ(ERR_NAME_NOT_RESOLVED, callback_.WaitForResult());
   EXPECT_EQ(LOAD_STATE_IDLE, transaction_.GetLoadState());
 }
diff --git a/net/ftp/ftp_transaction.h b/net/ftp/ftp_transaction.h
index d0620f6..3d629746 100644
--- a/net/ftp/ftp_transaction.h
+++ b/net/ftp/ftp_transaction.h
@@ -36,9 +36,9 @@ class FtpTransaction {
   // NOTE: The transaction is not responsible for deleting the callback object.
   //
   // Profiling information for the request is saved to |load_log| if non-NULL.
-  virtual int Start(LoadLog* load_log,
-                    const FtpRequestInfo* request_info,
-                    CompletionCallback* callback) = 0;
+  virtual int Start(const FtpRequestInfo* request_info,
+                    CompletionCallback* callback,
+                    LoadLog* load_log) = 0;
 
   // Restarts the FTP transaction with authentication credentials.
   virtual int RestartWithAuth(const std::wstring& username,