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

8 files changed, 91 insertions, 91 deletions

diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index 5265ca7..f40f463 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -194,7 +194,7 @@ class HttpCache::Transaction
   virtual ~Transaction();
 
   // HttpTransaction methods:
-  virtual int Start(LoadLog*, const HttpRequestInfo*, CompletionCallback*);
+  virtual int Start(const HttpRequestInfo*, CompletionCallback*, LoadLog*);
   virtual int RestartIgnoringLastError(CompletionCallback*);
   virtual int RestartWithCertificate(X509Certificate* client_cert,
                                      CompletionCallback* callback);
@@ -410,9 +410,9 @@ HttpCache::Transaction::~Transaction() {
   cache_ = NULL;
 }
 
-int HttpCache::Transaction::Start(LoadLog* load_log,
-                                  const HttpRequestInfo* request,
-                                  CompletionCallback* callback) {
+int HttpCache::Transaction::Start(const HttpRequestInfo* request,
+                                  CompletionCallback* callback,
+                                  LoadLog* load_log) {
   DCHECK(request);
   DCHECK(callback);
 
@@ -982,7 +982,7 @@ int HttpCache::Transaction::BeginNetworkRequest() {
   if (!network_trans_.get())
     return net::ERR_CACHE_CANNOT_CREATE_NETWORK_TRANSACTION;
 
-  int rv = network_trans_->Start(load_log_, request_, &network_info_callback_);
+  int rv = network_trans_->Start(request_, &network_info_callback_, load_log_);
   if (rv != ERR_IO_PENDING)
     OnNetworkInfoAvailable(rv);
   return rv;
diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc
index a7b93e0..482b463 100644
--- a/net/http/http_cache_unittest.cc
+++ b/net/http/http_cache_unittest.cc
@@ -394,7 +394,7 @@ void RunTransactionTestWithRequest(net::HttpCache* cache,
   scoped_ptr<net::HttpTransaction> trans(cache->CreateTransaction());
   ASSERT_TRUE(trans.get());
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   if (rv == net::ERR_IO_PENDING)
     rv = callback.WaitForResult();
   ASSERT_EQ(net::OK, rv);
@@ -680,7 +680,7 @@ TEST(HttpCache, SimpleGET_LoadOnlyFromCache_Miss) {
       cache.http_cache()->CreateTransaction());
   ASSERT_TRUE(trans.get());
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   if (rv == net::ERR_IO_PENDING)
     rv = callback.WaitForResult();
   ASSERT_EQ(net::ERR_CACHE_MISS, rv);
@@ -837,7 +837,7 @@ TEST(HttpCache, SimpleGET_ManyReaders) {
         new Context(cache.http_cache()->CreateTransaction()));
 
     Context* c = context_list[i];
-    int rv = c->trans->Start(NULL, &request, &c->callback);
+    int rv = c->trans->Start(&request, &c->callback, NULL);
     if (rv != net::ERR_IO_PENDING)
       c->result = rv;
   }
@@ -891,7 +891,7 @@ TEST(HttpCache, SimpleGET_RacingReaders) {
     if (i == 1 || i == 2)
       this_request = &reader_request;
 
-    int rv = c->trans->Start(NULL, this_request, &c->callback);
+    int rv = c->trans->Start(this_request, &c->callback, NULL);
     if (rv != net::ERR_IO_PENDING)
       c->result = rv;
   }
@@ -963,7 +963,7 @@ TEST(HttpCache, FastNoStoreGET_DoneWithPending) {
         new Context(cache.http_cache()->CreateTransaction()));
 
     Context* c = context_list[i];
-    int rv = c->trans->Start(NULL, &request, &c->callback);
+    int rv = c->trans->Start(&request, &c->callback, NULL);
     if (rv != net::ERR_IO_PENDING)
       c->result = rv;
   }
@@ -1006,7 +1006,7 @@ TEST(HttpCache, SimpleGET_ManyWriters_CancelFirst) {
         new Context(cache.http_cache()->CreateTransaction()));
 
     Context* c = context_list[i];
-    int rv = c->trans->Start(NULL, &request, &c->callback);
+    int rv = c->trans->Start(&request, &c->callback, NULL);
     if (rv != net::ERR_IO_PENDING)
       c->result = rv;
   }
@@ -1058,7 +1058,7 @@ TEST(HttpCache, SimpleGET_AbandonedCacheRead) {
 
   scoped_ptr<net::HttpTransaction> trans(
       cache.http_cache()->CreateTransaction());
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   if (rv == net::ERR_IO_PENDING)
     rv = callback.WaitForResult();
   ASSERT_EQ(net::OK, rv);
@@ -1573,7 +1573,7 @@ TEST(HttpCache, SimplePOST_LoadOnlyFromCache_Miss) {
       cache.http_cache()->CreateTransaction());
   ASSERT_TRUE(trans.get());
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   if (rv == net::ERR_IO_PENDING)
     rv = callback.WaitForResult();
   ASSERT_EQ(net::ERR_CACHE_MISS, rv);
@@ -1977,13 +1977,13 @@ TEST(HttpCache, SyncRead) {
                           c2(cache.http_cache()),
                           c3(cache.http_cache());
 
-  c1.Start(NULL, &r1);
+  c1.Start(&r1, NULL);
 
   r2.load_flags |= net::LOAD_ONLY_FROM_CACHE;
-  c2.Start(NULL, &r2);
+  c2.Start(&r2, NULL);
 
   r3.load_flags |= net::LOAD_ONLY_FROM_CACHE;
-  c3.Start(NULL, &r3);
+  c3.Start(&r3, NULL);
 
   MessageLoop::current()->Run();
 
@@ -2030,7 +2030,7 @@ TEST(HttpCache, CachedRedirect) {
         cache.http_cache()->CreateTransaction());
     ASSERT_TRUE(trans.get());
 
-    int rv = trans->Start(NULL, &request, &callback);
+    int rv = trans->Start(&request, &callback, NULL);
     if (rv == net::ERR_IO_PENDING)
       rv = callback.WaitForResult();
     ASSERT_EQ(net::OK, rv);
@@ -2057,7 +2057,7 @@ TEST(HttpCache, CachedRedirect) {
         cache.http_cache()->CreateTransaction());
     ASSERT_TRUE(trans.get());
 
-    int rv = trans->Start(NULL, &request, &callback);
+    int rv = trans->Start(&request, &callback, NULL);
     if (rv == net::ERR_IO_PENDING)
       rv = callback.WaitForResult();
     ASSERT_EQ(net::OK, rv);
@@ -2184,7 +2184,7 @@ TEST(HttpCache, SimpleGET_SSLError) {
       cache.http_cache()->CreateTransaction());
   ASSERT_TRUE(trans.get());
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   if (rv == net::ERR_IO_PENDING)
     rv = callback.WaitForResult();
   ASSERT_EQ(net::ERR_CACHE_MISS, rv);
diff --git a/net/http/http_network_layer_unittest.cc b/net/http/http_network_layer_unittest.cc
index 064a8e4..d70aa65 100644
--- a/net/http/http_network_layer_unittest.cc
+++ b/net/http/http_network_layer_unittest.cc
@@ -69,7 +69,7 @@ TEST_F(HttpNetworkLayerTest, GET) {
   request_info.user_agent = "Foo/1.0";
   request_info.load_flags = net::LOAD_NORMAL;
 
-  int rv = trans->Start(NULL, &request_info, &callback);
+  int rv = trans->Start(&request_info, &callback, NULL);
   if (rv == net::ERR_IO_PENDING)
     rv = callback.WaitForResult();
   ASSERT_EQ(net::OK, rv);
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 4b44cdc..0c0bc48 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -161,9 +161,9 @@ HttpNetworkTransaction::HttpNetworkTransaction(HttpNetworkSession* session,
 #endif
 }
 
-int HttpNetworkTransaction::Start(LoadLog* load_log,
-                                  const HttpRequestInfo* request_info,
-                                  CompletionCallback* callback) {
+int HttpNetworkTransaction::Start(const HttpRequestInfo* request_info,
+                                  CompletionCallback* callback,
+                                  LoadLog* load_log) {
   UpdateConnectionTypeHistograms(CONNECTION_ANY);
 
   load_log_ = load_log;
@@ -542,7 +542,7 @@ int HttpNetworkTransaction::DoResolveProxy() {
   }
 
   return session_->proxy_service()->ResolveProxy(
-      load_log_, request_->url, &proxy_info_, &io_callback_, &pac_request_);
+      request_->url, &proxy_info_, &io_callback_, &pac_request_, load_log_);
 }
 
 int HttpNetworkTransaction::DoResolveProxyComplete(int result) {
@@ -629,8 +629,8 @@ int HttpNetworkTransaction::DoInitConnection() {
 
   transport_socket_request_time_ = base::TimeTicks::Now();
 
-  int rv = connection_.Init(NULL, connection_group, resolve_info,
-                            request_->priority, &io_callback_);
+  int rv = connection_.Init(connection_group, resolve_info,
+                            request_->priority, &io_callback_, NULL);
   return rv;
 }
 
@@ -1549,7 +1549,7 @@ int HttpNetworkTransaction::ReconsiderProxyAfterError(int error) {
   }
 
   int rv = session_->proxy_service()->ReconsiderProxyAfterError(
-      load_log_, request_->url, &proxy_info_, &io_callback_, &pac_request_);
+      request_->url, &proxy_info_, &io_callback_, &pac_request_, load_log_);
   if (rv == OK || rv == ERR_IO_PENDING) {
     // If the error was during connection setup, there is no socket to
     // disconnect.
diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h
index 5f489fc..0c5f014 100644
--- a/net/http/http_network_transaction.h
+++ b/net/http/http_network_transaction.h
@@ -41,9 +41,9 @@ class HttpNetworkTransaction : public HttpTransaction {
   virtual ~HttpNetworkTransaction();
 
   // HttpTransaction methods:
-  virtual int Start(LoadLog* load_log,
-                    const HttpRequestInfo* request_info,
-                    CompletionCallback* callback);
+  virtual int Start(const HttpRequestInfo* request_info,
+                    CompletionCallback* callback,
+                    LoadLog* load_log);
   virtual int RestartIgnoringLastError(CompletionCallback* callback);
   virtual int RestartWithCertificate(X509Certificate* client_cert,
                                      CompletionCallback* callback);
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 28465b3..91c0d0b 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -96,7 +96,7 @@ class HttpNetworkTransactionTest : public PlatformTest {
 
     TestCompletionCallback callback;
 
-    int rv = trans->Start(NULL, &request, &callback);
+    int rv = trans->Start(&request, &callback, NULL);
     EXPECT_EQ(ERR_IO_PENDING, rv);
 
     out.rv = callback.WaitForResult();
@@ -169,12 +169,12 @@ class CaptureGroupNameSocketPool : public ClientSocketPool {
  public:
   CaptureGroupNameSocketPool() {
   }
-  virtual int RequestSocket(LoadLog* load_log,
-                            const std::string& group_name,
+  virtual int RequestSocket(const std::string& group_name,
                             const HostResolver::RequestInfo& resolve_info,
                             int priority,
                             ClientSocketHandle* handle,
-                            CompletionCallback* callback) {
+                            CompletionCallback* callback,
+                            LoadLog* load_log) {
     last_group_name_ = group_name;
     return ERR_IO_PENDING;
   }
@@ -352,7 +352,7 @@ TEST_F(HttpNetworkTransactionTest, Head) {
 
   TestCompletionCallback callback1;
 
-  int rv = trans->Start(NULL, &request, &callback1);
+  int rv = trans->Start(&request, &callback1, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback1.WaitForResult();
@@ -410,7 +410,7 @@ TEST_F(HttpNetworkTransactionTest, ReuseConnection) {
 
     TestCompletionCallback callback;
 
-    int rv = trans->Start(NULL, &request, &callback);
+    int rv = trans->Start(&request, &callback, NULL);
     EXPECT_EQ(ERR_IO_PENDING, rv);
 
     rv = callback.WaitForResult();
@@ -454,7 +454,7 @@ TEST_F(HttpNetworkTransactionTest, Ignores100) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -498,7 +498,7 @@ TEST_F(HttpNetworkTransactionTest, Ignores1xx) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -554,7 +554,7 @@ void HttpNetworkTransactionTest::KeepAliveConnectionResendRequestTest(
     scoped_ptr<HttpTransaction> trans(
         new HttpNetworkTransaction(session, &session_deps.socket_factory));
 
-    int rv = trans->Start(NULL, &request, &callback);
+    int rv = trans->Start(&request, &callback, NULL);
     EXPECT_EQ(ERR_IO_PENDING, rv);
 
     rv = callback.WaitForResult();
@@ -606,7 +606,7 @@ TEST_F(HttpNetworkTransactionTest, NonKeepAliveConnectionReset) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -693,7 +693,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuth) {
 
   TestCompletionCallback callback1;
 
-  int rv = trans->Start(NULL, &request, &callback1);
+  int rv = trans->Start(&request, &callback1, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback1.WaitForResult();
@@ -769,7 +769,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAlive) {
 
   TestCompletionCallback callback1;
 
-  int rv = trans->Start(NULL, &request, &callback1);
+  int rv = trans->Start(&request, &callback1, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback1.WaitForResult();
@@ -848,7 +848,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveNoBody) {
 
   TestCompletionCallback callback1;
 
-  int rv = trans->Start(NULL, &request, &callback1);
+  int rv = trans->Start(&request, &callback1, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback1.WaitForResult();
@@ -930,7 +930,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveLargeBody) {
 
   TestCompletionCallback callback1;
 
-  int rv = trans->Start(NULL, &request, &callback1);
+  int rv = trans->Start(&request, &callback1, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback1.WaitForResult();
@@ -1011,7 +1011,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyKeepAlive) {
 
   TestCompletionCallback callback1;
 
-  int rv = trans->Start(NULL, &request, &callback1);
+  int rv = trans->Start(&request, &callback1, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback1.WaitForResult();
@@ -1093,7 +1093,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyCancelTunnel) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -1146,7 +1146,7 @@ void HttpNetworkTransactionTest::ConnectStatusHelperWithExpectedStatus(
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -1406,7 +1406,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyThenServer) {
 
   TestCompletionCallback callback1;
 
-  int rv = trans->Start(NULL, &request, &callback1);
+  int rv = trans->Start(&request, &callback1, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback1.WaitForResult();
@@ -1541,7 +1541,7 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth1) {
 
   TestCompletionCallback callback1;
 
-  int rv = trans->Start(NULL, &request, &callback1);
+  int rv = trans->Start(&request, &callback1, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback1.WaitForResult();
@@ -1715,7 +1715,7 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth2) {
 
   TestCompletionCallback callback1;
 
-  int rv = trans->Start(NULL, &request, &callback1);
+  int rv = trans->Start(&request, &callback1, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback1.WaitForResult();
@@ -1810,7 +1810,7 @@ TEST_F(HttpNetworkTransactionTest, LargeHeadersNoBody) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -1858,7 +1858,7 @@ TEST_F(HttpNetworkTransactionTest, DontRecycleTCPSocketForSSLTunnel) {
 
   TestCompletionCallback callback1;
 
-  int rv = trans->Start(NULL, &request, &callback1);
+  int rv = trans->Start(&request, &callback1, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback1.WaitForResult();
@@ -1908,7 +1908,7 @@ TEST_F(HttpNetworkTransactionTest, RecycleSocket) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -1966,7 +1966,7 @@ TEST_F(HttpNetworkTransactionTest, RecycleSocketAfterZeroContentLength) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -2060,7 +2060,7 @@ TEST_F(HttpNetworkTransactionTest, ResendRequestOnWriteBodyError) {
 
     TestCompletionCallback callback;
 
-    int rv = trans->Start(NULL, &request[i], &callback);
+    int rv = trans->Start(&request[i], &callback, NULL);
     EXPECT_EQ(ERR_IO_PENDING, rv);
 
     rv = callback.WaitForResult();
@@ -2135,7 +2135,7 @@ TEST_F(HttpNetworkTransactionTest, AuthIdentityInUrl) {
 
   TestCompletionCallback callback1;
 
-  int rv = trans->Start(NULL, &request, &callback1);
+  int rv = trans->Start(&request, &callback1, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback1.WaitForResult();
@@ -2211,7 +2211,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
 
     TestCompletionCallback callback1;
 
-    int rv = trans->Start(NULL, &request, &callback1);
+    int rv = trans->Start(&request, &callback1, NULL);
     EXPECT_EQ(ERR_IO_PENDING, rv);
 
     rv = callback1.WaitForResult();
@@ -2295,7 +2295,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
 
     TestCompletionCallback callback1;
 
-    int rv = trans->Start(NULL, &request, &callback1);
+    int rv = trans->Start(&request, &callback1, NULL);
     EXPECT_EQ(ERR_IO_PENDING, rv);
 
     rv = callback1.WaitForResult();
@@ -2360,7 +2360,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
 
     TestCompletionCallback callback1;
 
-    int rv = trans->Start(NULL, &request, &callback1);
+    int rv = trans->Start(&request, &callback1, NULL);
     EXPECT_EQ(ERR_IO_PENDING, rv);
 
     rv = callback1.WaitForResult();
@@ -2421,7 +2421,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
 
     TestCompletionCallback callback1;
 
-    int rv = trans->Start(NULL, &request, &callback1);
+    int rv = trans->Start(&request, &callback1, NULL);
     EXPECT_EQ(ERR_IO_PENDING, rv);
 
     rv = callback1.WaitForResult();
@@ -2508,7 +2508,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
 
     TestCompletionCallback callback1;
 
-    int rv = trans->Start(NULL, &request, &callback1);
+    int rv = trans->Start(&request, &callback1, NULL);
     EXPECT_EQ(ERR_IO_PENDING, rv);
 
     rv = callback1.WaitForResult();
@@ -2645,7 +2645,7 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificate) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -2721,7 +2721,7 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaProxy) {
             CreateSession(&session_deps),
             &session_deps.socket_factory));
 
-    int rv = trans->Start(NULL, &request, &callback);
+    int rv = trans->Start(&request, &callback, NULL);
     EXPECT_EQ(ERR_IO_PENDING, rv);
 
     rv = callback.WaitForResult();
@@ -2772,7 +2772,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_UserAgent) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -2812,7 +2812,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_Referer) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -2850,7 +2850,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_PostContentLengthZero) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -2888,7 +2888,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_PutContentLengthZero) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -2926,7 +2926,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_HeadContentLengthZero) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -2966,7 +2966,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_CacheControlNoCache) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -3006,7 +3006,7 @@ TEST_F(HttpNetworkTransactionTest,
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -3045,7 +3045,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_ExtraHeaders) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -3090,7 +3090,7 @@ TEST_F(HttpNetworkTransactionTest, SOCKS4_HTTP_GET) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -3148,7 +3148,7 @@ TEST_F(HttpNetworkTransactionTest, SOCKS4_SSL_GET) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -3207,7 +3207,7 @@ TEST_F(HttpNetworkTransactionTest, SOCKS5_HTTP_GET) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -3270,7 +3270,7 @@ TEST_F(HttpNetworkTransactionTest, SOCKS5_SSL_GET) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -3350,7 +3350,7 @@ TEST_F(HttpNetworkTransactionTest, GroupNameForProxyConnections) {
     TestCompletionCallback callback;
 
     // We do not complete this request, the dtor will clean the transaction up.
-    EXPECT_EQ(ERR_IO_PENDING, trans->Start(NULL, &request, &callback));
+    EXPECT_EQ(ERR_IO_PENDING, trans->Start(&request, &callback, NULL));
     EXPECT_EQ(tests[i].expected_group_name,
               conn_pool->last_group_name_received());
   }
@@ -3373,7 +3373,7 @@ TEST_F(HttpNetworkTransactionTest, ReconsiderProxyAfterFailedConnection) {
 
   TestCompletionCallback callback;
 
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
@@ -3449,7 +3449,7 @@ TEST_F(HttpNetworkTransactionTest, ResolveMadeWithReferrer) {
 
   // Run the request until it fails reading from the socket.
   TestCompletionCallback callback;
-  int rv = trans->Start(NULL, &request, &callback);
+  int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
   rv = callback.WaitForResult();
   EXPECT_EQ(ERR_FAILED, rv);
@@ -3473,16 +3473,16 @@ TEST_F(HttpNetworkTransactionTest, BypassHostCacheOnRefresh) {
   // a synchronous lookup.)
   AddressList addrlist;
   int rv = session_deps.host_resolver->Resolve(
-      NULL, HostResolver::RequestInfo("www.google.com", 80), &addrlist,
-      NULL, NULL);
+      HostResolver::RequestInfo("www.google.com", 80), &addrlist,
+      NULL, NULL, NULL);
   EXPECT_EQ(OK, rv);
 
   // Verify that it was added to host cache, by doing a subsequent async lookup
   // and confirming it completes synchronously.
   TestCompletionCallback resolve_callback;
-  rv = session_deps.host_resolver->Resolve(NULL,
+  rv = session_deps.host_resolver->Resolve(
       HostResolver::RequestInfo("www.google.com", 80), &addrlist,
-      &resolve_callback, NULL);
+      &resolve_callback, NULL, NULL);
   ASSERT_EQ(OK, rv);
 
   // Inject a failure the next time that "www.google.com" is resolved. This way
@@ -3504,7 +3504,7 @@ TEST_F(HttpNetworkTransactionTest, BypassHostCacheOnRefresh) {
 
   // Run the request.
   TestCompletionCallback callback;
-  rv = trans->Start(NULL, &request, &callback);
+  rv = trans->Start(&request, &callback, NULL);
   ASSERT_EQ(ERR_IO_PENDING, rv);
   rv = callback.WaitForResult();
 
diff --git a/net/http/http_transaction.h b/net/http/http_transaction.h
index 962a7ac..9dfd658 100644
--- a/net/http/http_transaction.h
+++ b/net/http/http_transaction.h
@@ -38,9 +38,9 @@ class HttpTransaction {
   // 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 HttpRequestInfo* request_info,
-                    CompletionCallback* callback) = 0;
+  virtual int Start(const HttpRequestInfo* request_info,
+                    CompletionCallback* callback,
+                    LoadLog* load_log) = 0;
 
   // Restarts the HTTP transaction, ignoring the last error.  This call can
   // only be made after a call to Start (or RestartIgnoringLastError) failed.
diff --git a/net/http/http_transaction_unittest.h b/net/http/http_transaction_unittest.h
index 7aee84f..aef6693 100644
--- a/net/http/http_transaction_unittest.h
+++ b/net/http/http_transaction_unittest.h
@@ -108,9 +108,9 @@ class TestTransactionConsumer : public CallbackRunner< Tuple1<int> > {
   ~TestTransactionConsumer() {
   }
 
-  void Start(net::LoadLog* load_log, const net::HttpRequestInfo* request) {
+  void Start(const net::HttpRequestInfo* request, net::LoadLog* load_log) {
     state_ = STARTING;
-    int result = trans_->Start(load_log, request, this);
+    int result = trans_->Start(request, this, load_log);
     if (result != net::ERR_IO_PENDING)
       DidStart(result);
   }
@@ -199,9 +199,9 @@ class MockNetworkTransaction : public net::HttpTransaction {
       ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)), data_cursor_(0) {
   }
 
-  virtual int Start(net::LoadLog* load_log,
-                    const net::HttpRequestInfo* request,
-                    net::CompletionCallback* callback) {
+  virtual int Start(const net::HttpRequestInfo* request,
+                    net::CompletionCallback* callback,
+                    net::LoadLog* load_log) {
     const MockTransaction* t = FindMockTransaction(request->url);
     if (!t)
       return net::ERR_FAILED;