| 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 a7f0d01ccb4d6f0e517d646112bbcc86b02d9231..2bf23751f8fd5b0541b1b6cacfdca977ba542150 100644
|
| --- a/net/http/http_server_properties_manager.h
|
| +++ b/net/http/http_server_properties_manager.h
|
| @@ -87,8 +87,9 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {
|
| void SetHTTP11Required(const HostPortPair& server) override;
|
| void MaybeForceHTTP11(const HostPortPair& server,
|
| SSLConfig* ssl_config) override;
|
| - AlternativeService GetAlternativeService(const HostPortPair& origin) override;
|
| - void SetAlternativeService(const HostPortPair& origin,
|
| + AlternativeServiceVector GetAlternativeServices(
|
| + const HostPortPair& origin) override;
|
| + void AddAlternativeService(const HostPortPair& origin,
|
| const AlternativeService& alternative_service,
|
| double alternative_probability) override;
|
| void MarkAlternativeServiceBroken(
|
| @@ -101,7 +102,7 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {
|
| const AlternativeService& alternative_service) override;
|
| void ConfirmAlternativeService(
|
| const AlternativeService& alternative_service) override;
|
| - void ClearAlternativeService(const HostPortPair& origin) override;
|
| + void ClearAlternativeServices(const HostPortPair& origin) override;
|
| const AlternativeServiceMap& alternative_service_map() const override;
|
| scoped_ptr<base::Value> GetAlternativeServiceInfoAsValue() const override;
|
| void SetAlternativeServiceProbabilityThreshold(double threshold) override;
|
| @@ -222,7 +223,7 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {
|
| void SaveSpdySettingsToServerPrefs(const SettingsMap* spdy_settings_map,
|
| base::DictionaryValue* server_pref_dict);
|
| void SaveAlternativeServiceToServerPrefs(
|
| - const AlternativeServiceInfo* alternative_service_info,
|
| + const AlternativeServiceInfoVector* alternative_service_info_vector,
|
| base::DictionaryValue* server_pref_dict);
|
| void SaveNetworkStatsToServerPrefs(
|
| const ServerNetworkStats* server_network_stats,
|
|
|