net/http/http_stream_factory_impl_job.cc - Issue 1018943002: Update HttpServerProperties::*AlternateProtocol* interface.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 1018943002: Update HttpServerProperties::*AlternateProtocol* interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. 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

« components/cronet/android/cronet_url_request_context_adapter.cc ('K') | « net/http/http_stream_factory.cc ('k') | net/http/http_stream_factory_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 b2efe26432695025f3ac6f264772d9d06fc7130d..a6ae28f7edc415bb1bb447cf6d17232d68a19478 100644

--- a/net/http/http_stream_factory_impl_job.cc

+++ b/net/http/http_stream_factory_impl_job.cc

@@ -1494,8 +1494,8 @@ void HttpStreamFactoryImpl::Job::MaybeMarkAlternateProtocolBroken() {

if (job_status_ == STATUS_BROKEN && other_job_status_ == STATUS_SUCCEEDED) {

HistogramBrokenAlternateProtocolLocation(

BROKEN_ALTERNATE_PROTOCOL_LOCATION_HTTP_STREAM_FACTORY_IMPL_JOB_ALT);

- session_->http_server_properties()->SetBrokenAlternateProtocol(

- HostPortPair::FromURL(*original_url_));

+ session_->http_server_properties()->MarkAlternativeServiceBroken(

+ alternative_service_);

}

return;

}

@@ -1503,8 +1503,8 @@ void HttpStreamFactoryImpl::Job::MaybeMarkAlternateProtocolBroken() {

if (job_status_ == STATUS_SUCCEEDED && other_job_status_ == STATUS_BROKEN) {

HistogramBrokenAlternateProtocolLocation(

BROKEN_ALTERNATE_PROTOCOL_LOCATION_HTTP_STREAM_FACTORY_IMPL_JOB_MAIN);

- session_->http_server_properties()->SetBrokenAlternateProtocol(

- HostPortPair::FromURL(request_info_.url));

+ session_->http_server_properties()->MarkAlternativeServiceBroken(

+ other_job_alternative_service_);

}