| 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 b71671a5cccd975803f3c77982cd588d91441885..b265b24f5ba82d7b854ac595152fae14b02b350f 100644
|
| --- a/net/http/http_server_properties_manager.h
|
| +++ b/net/http/http_server_properties_manager.h
|
| @@ -86,16 +86,25 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {
|
| void SetHTTP11Required(const HostPortPair& server) override;
|
| void MaybeForceHTTP11(const HostPortPair& server,
|
| SSLConfig* ssl_config) override;
|
| - AlternateProtocolInfo GetAlternateProtocol(
|
| - const HostPortPair& server) override;
|
| - void SetAlternateProtocol(const HostPortPair& server,
|
| + AlternateProtocols GetAlternateProtocols(const HostPortPair& server) override;
|
| + void AddAlternateProtocol(const HostPortPair& server,
|
| uint16 alternate_port,
|
| AlternateProtocol alternate_protocol,
|
| double alternate_probability) override;
|
| - void SetBrokenAlternateProtocol(const HostPortPair& server) override;
|
| - bool WasAlternateProtocolRecentlyBroken(const HostPortPair& server) override;
|
| - void ConfirmAlternateProtocol(const HostPortPair& server) override;
|
| - void ClearAlternateProtocol(const HostPortPair& server) override;
|
| + void SetBrokenAlternateProtocol(
|
| + const HostPortPair& server,
|
| + const AlternateProtocolInfo& broken_alternate_protocol) override;
|
| + bool WasAlternateProtocolRecentlyBroken(
|
| + const HostPortPair& server,
|
| + const AlternateProtocolInfo& alternate_protocol) const override;
|
| + void ConfirmAlternateProtocol(
|
| + const HostPortPair& server,
|
| + const AlternateProtocolInfo& alternate_protocol) override;
|
| + void ClearAlternateProtocols(const HostPortPair& server) override;
|
| + void ClearNonBrokenAlternateProtocols(const HostPortPair& server) override;
|
| + void RemoveAlternateProtocol(
|
| + const HostPortPair& server,
|
| + const AlternateProtocolInfo& alternate_protocol) override;
|
| const AlternateProtocolMap& alternate_protocol_map() const override;
|
| void SetAlternateProtocolProbabilityThreshold(double threshold) override;
|
| const SettingsMap& GetSpdySettings(
|
| @@ -195,8 +204,9 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {
|
| void SaveSpdySettingsToServerPrefs(const SettingsMap* spdy_settings_map,
|
| base::DictionaryValue* server_pref_dict);
|
| void SaveAlternateProtocolToServerPrefs(
|
| - const AlternateProtocolInfo* port_alternate_protocol,
|
| - base::DictionaryValue* server_pref_dict);
|
| + const AlternateProtocols* port_alternate_protocol,
|
| + base::DictionaryValue* server_pref_dict,
|
| + const HostPortPair& server);
|
| void SaveNetworkStatsToServerPrefs(
|
| const ServerNetworkStats* server_network_stats,
|
| base::DictionaryValue* server_pref_dict);
|
|
|