net/http/http_stream_factory.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.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_server_properties_manager_unittest.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/http/http_stream_factory.cc

diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc

index c4d0e728881a9981086814874eba57f5d69578b5..35083f0429cde0513686a9c2a588b7d41614aaa7 100644

--- a/net/http/http_stream_factory.cc

+++ b/net/http/http_stream_factory.cc

@@ -84,7 +84,7 @@ void HttpStreamFactory::ProcessAlternateProtocol(

}

if (!is_valid || protocol == UNINITIALIZED_ALTERNATE_PROTOCOL) {

- http_server_properties->ClearAlternateProtocol(http_host_port_pair);

+ http_server_properties->ClearAlternativeService(http_host_port_pair);

return;

}

@@ -93,8 +93,9 @@ void HttpStreamFactory::ProcessAlternateProtocol(

if (mapping_rules)

mapping_rules->RewriteHost(&host_port);

- http_server_properties->SetAlternateProtocol(

- host_port, static_cast<uint16>(port), protocol, probability);

+ http_server_properties->SetAlternativeService(

+ host_port, AlternativeService(protocol, "", static_cast<uint16>(port)),

+ probability);

}

GURL HttpStreamFactory::ApplyHostMappingRules(const GURL& url,