diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-28 00:51:55 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-28 00:51:55 +0000 |
| commit | 7acf9829abc48e5ba74306329119c1f138f476b6 (patch) | |
| tree | 9d41fd91561d67fba6075ad446780674abc5ba80 /net/http/http_stream_factory_impl.cc | |
| parent | b4b48779ad91d6e254d164d61e5b21610e6d77a5 (diff) | |
| download | chromium_src-7acf9829abc48e5ba74306329119c1f138f476b6.zip chromium_src-7acf9829abc48e5ba74306329119c1f138f476b6.tar.gz chromium_src-7acf9829abc48e5ba74306329119c1f138f476b6.tar.bz2 | |
Add NetLog entries to preconnect HttpStreamFactoryImpl::Jobs.
R=eroman@chromium.org
BUG=111640
Review URL: http://codereview.chromium.org/9225028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_stream_factory_impl.cc')
| -rw-r--r-- | net/http/http_stream_factory_impl.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc index 2e817f6..3eb067a 100644 --- a/net/http/http_stream_factory_impl.cc +++ b/net/http/http_stream_factory_impl.cc @@ -72,13 +72,13 @@ HttpStreamRequest* HttpStreamFactoryImpl::RequestStream( 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); } 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); @@ -98,8 +98,7 @@ 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); @@ -108,11 +107,11 @@ void HttpStreamFactoryImpl::PreconnectStreams( 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); |