net/http/http_server_properties_manager.h - Issue 1824903002: Change the AlternativeServiceMap with SchemeOriginPair key.

Unified Diff: net/http/http_server_properties_manager.h

Issue 1824903002: Change the AlternativeServiceMap with SchemeOriginPair key. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add unittests Created 4 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

« 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/http/http_server_properties_manager.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 14278526c369f22897f0a92ea086674a1dd54cac..05d80f0392429d949b5dd249f1fe69e9fa5f0457 100644

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

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

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

base::WeakPtr<HttpServerProperties> GetWeakPtr() override;

void Clear() override;

- bool SupportsRequestPriority(const HostPortPair& server) override;

+ bool SupportsRequestPriority(const SchemeOriginPair& server) override;

bool GetSupportsSpdy(const HostPortPair& server) override;

void SetSupportsSpdy(const HostPortPair& server, bool support_spdy) override;

bool RequiresHTTP11(const HostPortPair& server) override;

@@ -116,12 +116,12 @@ 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 SchemeOriginPair& origin) override;

+ bool SetAlternativeService(const SchemeOriginPair& origin,

const AlternativeService& alternative_service,

double alternative_probability,

base::Time expiration) override;

- bool SetAlternativeServices(const HostPortPair& origin,

+ bool SetAlternativeServices(const SchemeOriginPair& 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 SchemeOriginPair& origin) override;

const AlternativeServiceMap& alternative_service_map() const override;

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

void SetAlternativeServiceProbabilityThreshold(double threshold) override;

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

const std::string& server_str,

AlternativeServiceInfo* alternative_service_info);

bool AddToAlternativeServiceMap(

- const HostPortPair& server,

+ const SchemeOriginPair& server,

const base::DictionaryValue& server_dict,

AlternativeServiceMap* alternative_service_map);

bool ReadSupportsQuic(const base::DictionaryValue& server_dict,