Add NetLog entries to preconnect HttpStreamFactoryImpl::Jobs

net/http/http_stream_factory_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_stream_factory_impl.h"
 
 #include "base/string_number_conversions.h"
 #include "base/stl_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_log.h"
@@ skipping 54 matching lines @@
 
   GURL alternate_url;
   bool has_alternate_protocol =
       GetAlternateProtocolRequestFor(request_info.url, &alternate_url);
   Job* alternate_job = NULL;
   if (has_alternate_protocol) {
     HttpRequestInfo alternate_request_info = request_info;
     alternate_request_info.url = alternate_url;
     alternate_job =
         new Job(this, session_, alternate_request_info, server_ssl_config,
-                proxy_ssl_config, net_log);
+                proxy_ssl_config, net_log.net_log());
     request->AttachJob(alternate_job);
     alternate_job->MarkAsAlternate(request_info.url);
   }
 
+  // We use |net_log|'s NetLog instead of |session_->net_log()| for unit

[eroman, 2012/01/27 20:09:10]

i don't understand the reference to unit-testing here.. because this constructor
is used by tests?

[mmenke1, 2012/01/27 20:12:49]

Some of the unit tests pass in a CapturingNetLog when starting requests, so we
need to use the net_log's NetLog.  Otherwise, it arguably would be better and
more consistent to use session_->net_log() here as well as below.

If you find the comment confusing, though, may be best to remove it.

+  // testing.
   Job* job = new Job(this, session_, request_info, server_ssl_config,
-                     proxy_ssl_config, net_log);
+                     proxy_ssl_config, net_log.net_log());
   request->AttachJob(job);
   if (alternate_job) {
     job->WaitFor(alternate_job);
     // Make sure to wait until we call WaitFor(), before starting
     // |alternate_job|, otherwise |alternate_job| will not notify |job|
     // appropriately.
     alternate_job->Start(request);
   }
   // Even if |alternate_job| has already finished, it won't have notified the
   // request yet, since we defer that to the next iteration of the MessageLoop,
   // so starting |job| is always safe.
   job->Start(request);
   return request;
 }
 
 void HttpStreamFactoryImpl::PreconnectStreams(
     int num_streams,
     const HttpRequestInfo& request_info,
     const SSLConfig& server_ssl_config,
-    const SSLConfig& proxy_ssl_config,
-    const BoundNetLog& net_log) {
+    const SSLConfig& proxy_ssl_config) {
   GURL alternate_url;
   bool has_alternate_protocol =
       GetAlternateProtocolRequestFor(request_info.url, &alternate_url);
   Job* job = NULL;
   if (has_alternate_protocol) {
     HttpRequestInfo alternate_request_info = request_info;
     alternate_request_info.url = alternate_url;
     job = new Job(this, session_, alternate_request_info, server_ssl_config,
-                  proxy_ssl_config, net_log);
+                  proxy_ssl_config, session_->net_log());
     job->MarkAsAlternate(request_info.url);
   } else {
     job = new Job(this, session_, request_info, server_ssl_config,
-                  proxy_ssl_config, net_log);
+                  proxy_ssl_config, session_->net_log());
   }
   preconnect_job_set_.insert(job);
   job->Preconnect(num_streams);
 }
 
 void HttpStreamFactoryImpl::AddTLSIntolerantServer(const HostPortPair& server) {
   tls_intolerant_servers_.insert(server);
 }
 
 bool HttpStreamFactoryImpl::IsTLSIntolerantServer(
@@ skipping 118 matching lines @@
                       false,  // not using_spdy
                       stream->net_log());
     request->OnStreamReady(NULL,
                            stream->used_ssl_config(),
                            stream->used_proxy_info(),
                            stream);
   }
 }
 
 }  // namespace net