Add a "LoadLog*" parameter to transactions, hostresolver, clientsocketpool.

net/base/host_resolver_impl_unittest.cc

Index: net/base/host_resolver_impl_unittest.cc
===================================================================
--- net/base/host_resolver_impl_unittest.cc	(revision 23124)
+++ net/base/host_resolver_impl_unittest.cc	(working copy)
@@ -91,7 +91,7 @@
         ALLOW_THIS_IN_INITIALIZER_LIST(
             callback_(this, &ResolveRequest::OnLookupFinished)) {
     // Start the request.
-    int err = resolver->Resolve(info_, &addrlist_, &callback_, &req_);
+    int err = resolver->Resolve(NULL, info_, &addrlist_, &callback_, &req_);
     EXPECT_EQ(net::ERR_IO_PENDING, err);
   }
 
@@ -102,7 +102,7 @@
         ALLOW_THIS_IN_INITIALIZER_LIST(
             callback_(this, &ResolveRequest::OnLookupFinished)) {
     // Start the request.
-    int err = resolver->Resolve(info, &addrlist_, &callback_, &req_);
+    int err = resolver->Resolve(NULL, info, &addrlist_, &callback_, &req_);
     EXPECT_EQ(net::ERR_IO_PENDING, err);
   }
 
@@ -187,7 +187,7 @@
       new HostResolverImpl(resolver_proc, kMaxCacheEntries, kMaxCacheAgeMs));
 
   net::HostResolver::RequestInfo info("just.testing", kPortnum);
-  int err = host_resolver->Resolve(info, &adrlist, NULL, NULL);
+  int err = host_resolver->Resolve(NULL, info, &adrlist, NULL, NULL);
   EXPECT_EQ(net::OK, err);
 
   const struct addrinfo* ainfo = adrlist.head();
@@ -212,7 +212,7 @@
       new HostResolverImpl(resolver_proc, kMaxCacheEntries, kMaxCacheAgeMs));
 
   net::HostResolver::RequestInfo info("just.testing", kPortnum);
-  int err = host_resolver->Resolve(info, &adrlist, &callback_, NULL);
+  int err = host_resolver->Resolve(NULL, info, &adrlist, &callback_, NULL);
   EXPECT_EQ(net::ERR_IO_PENDING, err);
 
   MessageLoop::current()->Run();
@@ -241,7 +241,7 @@
     const int kPortnum = 80;
 
     net::HostResolver::RequestInfo info("just.testing", kPortnum);
-    int err = host_resolver->Resolve(info, &adrlist, &callback_, NULL);
+    int err = host_resolver->Resolve(NULL, info, &adrlist, &callback_, NULL);
     EXPECT_EQ(net::ERR_IO_PENDING, err);
 
     // Make sure we will exit the queue even when callback is not called.
@@ -268,7 +268,7 @@
   net::AddressList adrlist;
   const int kPortnum = 5555;
   net::HostResolver::RequestInfo info("127.1.2.3", kPortnum);
-  int err = host_resolver->Resolve(info, &adrlist, NULL, NULL);
+  int err = host_resolver->Resolve(NULL, info, &adrlist, NULL, NULL);
   EXPECT_EQ(net::OK, err);
 
   const struct addrinfo* ainfo = adrlist.head();
@@ -293,7 +293,7 @@
   net::AddressList adrlist;
   const int kPortnum = 5555;
   net::HostResolver::RequestInfo info("2001:db8::1", kPortnum);
-  int err = host_resolver->Resolve(info, &adrlist, NULL, NULL);
+  int err = host_resolver->Resolve(NULL, info, &adrlist, NULL, NULL);
   // On computers without IPv6 support, getaddrinfo cannot convert IPv6
   // address literals to addresses (getaddrinfo returns EAI_NONAME).  So this
   // test has to allow host_resolver->Resolve to fail.
@@ -333,7 +333,7 @@
   net::AddressList adrlist;
   const int kPortnum = 5555;
   net::HostResolver::RequestInfo info("", kPortnum);
-  int err = host_resolver->Resolve(info, &adrlist, NULL, NULL);
+  int err = host_resolver->Resolve(NULL, info, &adrlist, NULL, NULL);
   EXPECT_EQ(net::ERR_NAME_NOT_RESOLVED, err);
 }
 
@@ -684,7 +684,7 @@
       net::AddressList addrlist;
 
       net::HostResolver::RequestInfo info("a", 70);
-      int error = resolver->Resolve(info, &addrlist, junk_callback, NULL);
+      int error = resolver->Resolve(NULL, info, &addrlist, junk_callback, NULL);
       EXPECT_EQ(net::OK, error);
 
       // Ok good. Now make sure that if we ask to bypass the cache, it can no
@@ -801,7 +801,7 @@
 
   // Resolve "host1".
   net::HostResolver::RequestInfo info1("host1", 70);
-  int rv = host_resolver->Resolve(info1, &addrlist, NULL, NULL);
+  int rv = host_resolver->Resolve(NULL, info1, &addrlist, NULL, NULL);
   EXPECT_EQ(net::OK, rv);
 
   EXPECT_EQ(1U, observer.start_log.size());
@@ -815,7 +815,7 @@
   // Resolve "host1" again -- this time it  will be served from cache, but it
   // should still notify of completion.
   TestCompletionCallback callback;
-  rv = host_resolver->Resolve(info1, &addrlist, &callback, NULL);
+  rv = host_resolver->Resolve(NULL, info1, &addrlist, &callback, NULL);
   ASSERT_EQ(net::OK, rv);  // Should complete synchronously.
 
   EXPECT_EQ(2U, observer.start_log.size());
@@ -829,7 +829,7 @@
   // Resolve "host2", setting referrer to "http://foobar.com"
   net::HostResolver::RequestInfo info2("host2", 70);
   info2.set_referrer(GURL("http://foobar.com"));
-  rv = host_resolver->Resolve(info2, &addrlist, NULL, NULL);
+  rv = host_resolver->Resolve(NULL, info2, &addrlist, NULL, NULL);
   EXPECT_EQ(net::OK, rv);
 
   EXPECT_EQ(3U, observer.start_log.size());
@@ -845,7 +845,7 @@
 
   // Resolve "host3"
   net::HostResolver::RequestInfo info3("host3", 70);
-  host_resolver->Resolve(info3, &addrlist, NULL, NULL);
+  host_resolver->Resolve(NULL, info3, &addrlist, NULL, NULL);
 
   // No effect this time, since observer was removed.
   EXPECT_EQ(3U, observer.start_log.size());
@@ -875,7 +875,7 @@
     net::HostResolver::RequestInfo info1("host1", 70);
     net::HostResolver::RequestHandle req = NULL;
     net::AddressList addrlist;
-    int rv = host_resolver->Resolve(info1, &addrlist, &callback, &req);
+    int rv = host_resolver->Resolve(NULL, info1, &addrlist, &callback, &req);
     EXPECT_EQ(net::ERR_IO_PENDING, rv);
     EXPECT_TRUE(NULL != req);
 
@@ -898,7 +898,7 @@
 
     // Start an async request for (host2:60)
     net::HostResolver::RequestInfo info2("host2", 60);
-    rv = host_resolver->Resolve(info2, &addrlist, &callback, NULL);
+    rv = host_resolver->Resolve(NULL, info2, &addrlist, &callback, NULL);
     EXPECT_EQ(net::ERR_IO_PENDING, rv);
     EXPECT_TRUE(NULL != req);