Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1377)

Unified Diff: net/http/http_stream_factory_impl.cc

Issue 871753006: Add AlternateProtocolInfo to HttpStreamFactoryImpl::Job. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/http/http_stream_factory_impl.cc
diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc
index 9e932ee99cc0e3cf4ed6d415f8c684a4a0a56aa7..b0eda0b05f8770b2ee15eaa4fa7838ea9c41d6b0 100644
--- a/net/http/http_stream_factory_impl.cc
+++ b/net/http/http_stream_factory_impl.cc
@@ -116,15 +116,15 @@ HttpStreamRequest* HttpStreamFactoryImpl::RequestStreamInternal(
HttpRequestInfo alternate_request_info = request_info;
alternate_request_info.url = alternate_url;
- alternate_job =
- new Job(this, session_, alternate_request_info, priority,
- server_ssl_config, proxy_ssl_config, net_log.net_log());
+ alternate_job = new Job(this, session_, alternate_request_info, priority,
+ server_ssl_config, proxy_ssl_config,
+ net_log.net_log(), alternate);
request->AttachJob(alternate_job);
- alternate_job->MarkAsAlternate(request_info.url, alternate);
+ alternate_job->MarkAsAlternate(request_info.url);
}
- Job* job = new Job(this, session_, request_info, priority,
- server_ssl_config, proxy_ssl_config, net_log.net_log());
+ Job* job = new Job(this, session_, request_info, priority, server_ssl_config,
+ proxy_ssl_config, net_log.net_log(), alternate);
request->AttachJob(job);
if (alternate_job) {
// Never share connection with other jobs for FTP requests.
@@ -158,11 +158,12 @@ void HttpStreamFactoryImpl::PreconnectStreams(
HttpRequestInfo alternate_request_info = request_info;
alternate_request_info.url = alternate_url;
job = new Job(this, session_, alternate_request_info, priority,
- server_ssl_config, proxy_ssl_config, session_->net_log());
- job->MarkAsAlternate(request_info.url, alternate);
+ server_ssl_config, proxy_ssl_config, session_->net_log(),
+ alternate);
+ job->MarkAsAlternate(request_info.url);
} else {
- job = new Job(this, session_, request_info, priority,
- server_ssl_config, proxy_ssl_config, session_->net_log());
+ job = new Job(this, session_, request_info, priority, server_ssl_config,
+ proxy_ssl_config, session_->net_log(), alternate);
}
preconnect_job_set_.insert(job);
job->Preconnect(num_streams);

Powered by Google App Engine
This is Rietveld 408576698