net/http/http_server_properties_manager.h - Issue 1878143005: SHP 4: Change AlternativeServiceMap to use SchemeHostPort as the key. No change to Pref data.

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_server_properties_manager.h

Issue 1878143005: SHP 4: Change AlternativeServiceMap to use SchemeHostPort as the key. No change to Pref data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@SHP_3

Patch Set: fix a comment Created 4 years, 8 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

« net/http/http_server_properties_impl.cc ('K') | « net/http/http_server_properties_impl_unittest.cc ('k') | net/http/http_server_properties_manager.cc » ('j') | net/quic/quic_stream_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/http/http_server_properties_manager.h

diff --git a/net/http/http_server_properties_manager.h b/net/http/http_server_properties_manager.h

index 04dfcd57c7053ff4c180a81eef0baf3c27dff321..eda6ea349face8ce520bb5825e6b2c9d3cdf1f4b 100644

--- a/net/http/http_server_properties_manager.h

+++ b/net/http/http_server_properties_manager.h

@@ -117,11 +117,11 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {

void MaybeForceHTTP11(const HostPortPair& server,

SSLConfig* ssl_config) override;

AlternativeServiceVector GetAlternativeServices(

- const HostPortPair& origin) override;

- bool SetAlternativeService(const HostPortPair& origin,

+ const url::SchemeHostPort& origin) override;

+ bool SetAlternativeService(const url::SchemeHostPort& origin,

const AlternativeService& alternative_service,

base::Time expiration) override;

- bool SetAlternativeServices(const HostPortPair& origin,

+ bool SetAlternativeServices(const url::SchemeHostPort& origin,

const AlternativeServiceInfoVector&

alternative_service_info_vector) override;

void MarkAlternativeServiceBroken(

@@ -134,7 +134,7 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {

const AlternativeService& alternative_service) override;

void ConfirmAlternativeService(

const AlternativeService& alternative_service) override;

- void ClearAlternativeServices(const HostPortPair& origin) override;

+ void ClearAlternativeServices(const url::SchemeHostPort& origin) override;

const AlternativeServiceMap& alternative_service_map() const override;

scoped_ptr<base::Value> GetAlternativeServiceInfoAsValue() const override;

const SettingsMap& GetSpdySettings(

@@ -263,7 +263,7 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {

const std::string& server_str,

AlternativeServiceInfo* alternative_service_info);

bool AddToAlternativeServiceMap(

- const HostPortPair& server,

+ const url::SchemeHostPort& server,

const base::DictionaryValue& server_dict,

AlternativeServiceMap* alternative_service_map);

bool ReadSupportsQuic(const base::DictionaryValue& server_dict,