| Index: net/http/http_server_properties.h
|
| diff --git a/net/http/http_server_properties.h b/net/http/http_server_properties.h
|
| index 718f4c5a4e54dee5b455cd55cd71432423a33350..88d1f3cefba5978d3456823a69e81cc63ad44464 100644
|
| --- a/net/http/http_server_properties.h
|
| +++ b/net/http/http_server_properties.h
|
| @@ -92,29 +92,19 @@
|
| NET_EXPORT_PRIVATE AlternateProtocol AlternateProtocolFromNextProto(
|
| NextProto next_proto);
|
|
|
| -struct NET_EXPORT AlternateProtocolInfo {
|
| - AlternateProtocolInfo(uint16 port,
|
| - AlternateProtocol protocol,
|
| - double probability)
|
| - : port(port),
|
| - protocol(protocol),
|
| - probability(probability) {}
|
| -
|
| - bool Equals(const AlternateProtocolInfo& other) const {
|
| - return port == other.port &&
|
| - protocol == other.protocol &&
|
| - probability == other.probability;
|
| +struct NET_EXPORT PortAlternateProtocolPair {
|
| + bool Equals(const PortAlternateProtocolPair& other) const {
|
| + return port == other.port && protocol == other.protocol;
|
| }
|
|
|
| std::string ToString() const;
|
|
|
| uint16 port;
|
| AlternateProtocol protocol;
|
| - double probability;
|
| };
|
|
|
| typedef base::MRUCache<
|
| - HostPortPair, AlternateProtocolInfo> AlternateProtocolMap;
|
| + HostPortPair, PortAlternateProtocolPair> AlternateProtocolMap;
|
| typedef base::MRUCache<HostPortPair, SettingsMap> SpdySettingsMap;
|
|
|
| extern const char kAlternateProtocolHeader[];
|
| @@ -153,14 +143,13 @@
|
|
|
| // Returns the Alternate-Protocol and port for |server|.
|
| // HasAlternateProtocol(server) must be true.
|
| - virtual AlternateProtocolInfo GetAlternateProtocol(
|
| + virtual PortAlternateProtocolPair GetAlternateProtocol(
|
| const HostPortPair& server) = 0;
|
|
|
| // Sets the Alternate-Protocol for |server|.
|
| virtual void SetAlternateProtocol(const HostPortPair& server,
|
| uint16 alternate_port,
|
| - AlternateProtocol alternate_protocol,
|
| - double probability) = 0;
|
| + AlternateProtocol alternate_protocol) = 0;
|
|
|
| // Sets the Alternate-Protocol for |server| to be BROKEN.
|
| virtual void SetBrokenAlternateProtocol(const HostPortPair& server) = 0;
|
| @@ -180,9 +169,6 @@
|
|
|
| virtual void SetAlternateProtocolExperiment(
|
| AlternateProtocolExperiment experiment) = 0;
|
| -
|
| - virtual void SetAlternateProtocolProbabilityThreshold(
|
| - double threshold) = 0;
|
|
|
| virtual AlternateProtocolExperiment GetAlternateProtocolExperiment()
|
| const = 0;
|
|
|