| Index: net/http/http_server_properties_impl.h
|
| diff --git a/net/http/http_server_properties_impl.h b/net/http/http_server_properties_impl.h
|
| index e42594a42a9c87c10d3ca64e80232504b3de0c01..75bb001ee334e27b6aa7d4ec577cc607ed26c80c 100644
|
| --- a/net/http/http_server_properties_impl.h
|
| +++ b/net/http/http_server_properties_impl.h
|
| @@ -79,7 +79,7 @@ class NET_EXPORT HttpServerPropertiesImpl
|
|
|
| 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;
|
| @@ -87,12 +87,12 @@ class NET_EXPORT HttpServerPropertiesImpl
|
| 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(
|
| @@ -105,7 +105,7 @@ class NET_EXPORT HttpServerPropertiesImpl
|
| 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;
|
| @@ -155,7 +155,7 @@ class NET_EXPORT HttpServerPropertiesImpl
|
|
|
| // Return the iterator for |server|, or for its canonical host, or end.
|
| AlternativeServiceMap::const_iterator GetAlternateProtocolIterator(
|
| - const HostPortPair& server);
|
| + const SchemeOriginPair& server);
|
|
|
| // Return the canonical host for |server|, or end if none exists.
|
| CanonicalHostMap::const_iterator GetCanonicalHost(HostPortPair server) const;
|
|
|