Use a NetLog for test requests seny by the the about:net-internals

connection tester.

BUG=none

Review URL: https://chromiumcodereview.appspot.com/10796112

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

chrome/browser/net/connection_tester.cc

@@ -83,7 +83,8 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
   }
 
   int Init(const ConnectionTester::Experiment& experiment,
-           scoped_ptr<net::ProxyConfigService>* proxy_config_service) {
+           scoped_ptr<net::ProxyConfigService>* proxy_config_service,
+           net::NetLog* net_log) {
     int rv;
 
     // Create a custom HostResolver for this experiment.
@@ -116,9 +117,10 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
     session_params.host_resolver = host_resolver();
     session_params.cert_verifier = cert_verifier();
     session_params.proxy_service = proxy_service();
+    session_params.ssl_config_service = ssl_config_service();
     session_params.http_auth_handler_factory = http_auth_handler_factory();
     session_params.http_server_properties = http_server_properties();
-    session_params.ssl_config_service = ssl_config_service();
+    session_params.net_log = net_log;
     scoped_refptr<net::HttpNetworkSession> network_session(
         new net::HttpNetworkSession(session_params));
     storage_.set_http_transaction_factory(new net::HttpCache(
@@ -288,8 +290,9 @@ class ConnectionTester::TestRunner : public net::URLRequest::Delegate {
  public:
   // |tester| must remain alive throughout the TestRunner's lifetime.
   // |tester| will be notified of completion.
-  explicit TestRunner(ConnectionTester* tester)
+  TestRunner(ConnectionTester* tester, net::NetLog* net_log)
       : tester_(tester),
+        net_log_(net_log),
         ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
 
   // Finish running |experiment| once a ProxyConfigService has been created.
@@ -323,6 +326,7 @@ class ConnectionTester::TestRunner : public net::URLRequest::Delegate {
   ConnectionTester* tester_;
   scoped_ptr<ExperimentURLRequestContext> request_context_;
   scoped_ptr<net::URLRequest> request_;
+  net::NetLog* net_log_;
 
   base::WeakPtrFactory<TestRunner> weak_factory_;
 
@@ -389,7 +393,9 @@ void ConnectionTester::TestRunner::ProxyConfigServiceCreated(
     scoped_ptr<net::ProxyConfigService>* proxy_config_service,
     int status) {
   if (status == net::OK)
-    status = request_context_->Init(experiment, proxy_config_service);
+    status = request_context_->Init(experiment,
+                                    proxy_config_service,
+                                    net_log_);
   if (status != net::OK) {
     tester_->OnExperimentCompleted(status);
     return;
@@ -422,8 +428,11 @@ void ConnectionTester::TestRunner::Run(const Experiment& experiment) {
 
 ConnectionTester::ConnectionTester(
     Delegate* delegate,
-    net::URLRequestContext* proxy_request_context)
-    : delegate_(delegate), proxy_request_context_(proxy_request_context) {
+    net::URLRequestContext* proxy_request_context,
+    net::NetLog* net_log)
+    : delegate_(delegate),
+      proxy_request_context_(proxy_request_context),
+      net_log_(net_log) {
   DCHECK(delegate);
   DCHECK(proxy_request_context);
 }
@@ -503,7 +512,7 @@ void ConnectionTester::StartNextExperiment() {
 
   delegate_->OnStartConnectionTestExperiment(current_experiment());
 
-  current_test_runner_.reset(new TestRunner(this));
+  current_test_runner_.reset(new TestRunner(this, net_log_));
   current_test_runner_->Run(current_experiment());
 }
 

chrome/browser/net/connection_tester.h

@@ -13,6 +13,7 @@
 #include "net/base/completion_callback.h"
 
 namespace net {
+class NetLog;
 class URLRequestContext;
 }  // namespace net
 
@@ -128,7 +129,8 @@ class ConnectionTester {
   // |delegate| is owned by the caller, and must remain valid for the lifetime
   // of ConnectionTester.
   ConnectionTester(Delegate* delegate,
-                   net::URLRequestContext* proxy_request_context);
+                   net::URLRequestContext* proxy_request_context,
+                   net::NetLog* net_log);
 
   // Note that destruction cancels any in-progress tests.
   ~ConnectionTester();
@@ -176,6 +178,8 @@ class ConnectionTester {
 
   net::URLRequestContext* const proxy_request_context_;
 
+  net::NetLog* net_log_;
+
   DISALLOW_COPY_AND_ASSIGN(ConnectionTester);
 };
 

chrome/browser/net/connection_tester_unittest.cc

@@ -148,7 +148,9 @@ class ConnectionTesterTest : public PlatformTest {
 TEST_F(ConnectionTesterTest, RunAllTests) {
   ASSERT_TRUE(test_server_.Start());
 
-  ConnectionTester tester(&test_delegate_, proxy_script_fetcher_context_.get());
+  ConnectionTester tester(&test_delegate_,
+                          proxy_script_fetcher_context_.get(),
+                          NULL);
 
   // Start the test suite on URL "echoall".
   // TODO(eroman): Is this URL right?
@@ -174,7 +176,8 @@ TEST_F(ConnectionTesterTest, DeleteWhileInProgress) {
 
   scoped_ptr<ConnectionTester> tester(
       new ConnectionTester(&test_delegate_,
-                           proxy_script_fetcher_context_.get()));
+                           proxy_script_fetcher_context_.get(),
+                           NULL));
 
   // Start the test suite on URL "echoall".
   // TODO(eroman): Is this URL right?

chrome/browser/ui/webui/net_internals/net_internals_ui.cc

@@ -1081,7 +1081,9 @@ void NetInternalsMessageHandler::IOThreadImpl::OnStartConnectionTests(
   GURL url(URLFixerUpper::FixupURL(UTF16ToUTF8(url_str), std::string()));
 
   connection_tester_.reset(new ConnectionTester(
-      this, io_thread_->globals()->proxy_script_fetcher_context.get()));
+      this,
+      io_thread_->globals()->proxy_script_fetcher_context.get(),
+      net_log()));
   connection_tester_->RunAllTests(url);
 }