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

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 1011013002: Make GetAlternateProtocolRequestFor return AlternativeService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re: nit. Created 5 years, 9 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
« no previous file with comments | « net/http/http_stream_factory_impl_job.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index f9f6e39883934a6fea57ac53b78702783f21fc26..b2efe26432695025f3ac6f264772d9d06fc7130d 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -167,11 +167,11 @@ LoadState HttpStreamFactoryImpl::Job::GetLoadState() const {
void HttpStreamFactoryImpl::Job::MarkAsAlternate(
const GURL& original_url,
- AlternateProtocolInfo alternate) {
+ AlternativeService alternative_service) {
DCHECK(!original_url_.get());
original_url_.reset(new GURL(original_url));
- alternate_protocol_ = alternate;
- if (alternate.protocol == QUIC) {
+ alternative_service_ = alternative_service;
+ if (alternative_service.protocol == QUIC) {
DCHECK(session_->params().enable_quic);
using_quic_ = true;
}
@@ -1481,7 +1481,7 @@ void HttpStreamFactoryImpl::Job::ReportJobSuccededForRequest() {
void HttpStreamFactoryImpl::Job::MarkOtherJobComplete(const Job& job) {
DCHECK_EQ(STATUS_RUNNING, other_job_status_);
other_job_status_ = job.job_status_;
- other_job_alternate_protocol_ = job.alternate_protocol_;
+ other_job_alternative_service_ = job.alternative_service_;
MaybeMarkAlternateProtocolBroken();
}
« no previous file with comments | « net/http/http_stream_factory_impl_job.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698