| 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 f5eb4bad191afe9b7dcd1e2f94afab8a640ce0a0..745167582ec956828e6058272c9f4e6b13927da4 100644
|
| --- a/net/http/http_server_properties_impl.h
|
| +++ b/net/http/http_server_properties_impl.h
|
| @@ -26,10 +26,6 @@
|
| #include "net/http/broken_alternative_services.h"
|
| #include "net/http/http_server_properties.h"
|
|
|
| -namespace base {
|
| -class ListValue;
|
| -}
|
| -
|
| namespace net {
|
|
|
| // The implementation for setting/retrieving the HTTP server properties.
|
| @@ -44,21 +40,22 @@ class NET_EXPORT HttpServerPropertiesImpl
|
|
|
| // Sets |spdy_servers_map_| with the servers (host/port) from
|
| // |spdy_servers| that either support SPDY or not.
|
| - void SetSpdyServers(std::vector<std::string>* spdy_servers,
|
| - bool support_spdy);
|
| + void SetSpdyServers(std::unique_ptr<SpdyServersMap> spdy_servers_map);
|
|
|
| void SetAlternativeServiceServers(
|
| - AlternativeServiceMap* alternate_protocol_servers);
|
| + std::unique_ptr<AlternativeServiceMap> alternate_protocol_servers);
|
|
|
| - void SetSupportsQuic(IPAddress* last_address);
|
| + void SetSupportsQuic(const IPAddress& last_address);
|
|
|
| - void SetServerNetworkStats(ServerNetworkStatsMap* server_network_stats_map);
|
| + void SetServerNetworkStats(
|
| + std::unique_ptr<ServerNetworkStatsMap> server_network_stats_map);
|
|
|
| - void SetQuicServerInfoMap(QuicServerInfoMap* quic_server_info_map);
|
| + void SetQuicServerInfoMap(
|
| + std::unique_ptr<QuicServerInfoMap> quic_server_info_map);
|
|
|
| // Get the list of servers (host/port) that support SPDY. The max_size is the
|
| // number of MRU servers that support SPDY that are to be returned.
|
| - void GetSpdyServerList(base::ListValue* spdy_server_list,
|
| + void GetSpdyServerList(std::vector<std::string>* spdy_servers,
|
| size_t max_size) const;
|
|
|
| // Returns flattened string representation of the |host_port_pair|. Used by
|
| @@ -129,9 +126,6 @@ class NET_EXPORT HttpServerPropertiesImpl
|
| // friendness is no longer required.
|
| friend class HttpServerPropertiesImplPeer;
|
|
|
| - // |spdy_servers_map_| has flattened representation of servers
|
| - // (scheme, host, port) that either support or not support SPDY protocol.
|
| - typedef base::MRUCache<std::string, bool> SpdyServersMap;
|
| typedef std::map<url::SchemeHostPort, url::SchemeHostPort> CanonicalHostMap;
|
| typedef std::vector<std::string> CanonicalSufficList;
|
| typedef std::set<HostPortPair> Http11ServerHostPortSet;
|
|
|