| Index: net/http/http_server_properties.h
|
| diff --git a/net/http/http_server_properties.h b/net/http/http_server_properties.h
|
| index 82c63b0dd859038ffde18e36b37ad6af4f93fb31..7ad4f658699c497a224ee0174eeaf21d6709d92c 100644
|
| --- a/net/http/http_server_properties.h
|
| +++ b/net/http/http_server_properties.h
|
| @@ -69,16 +69,16 @@ enum AlternateProtocol {
|
| NET_EXPORT bool IsAlternateProtocolValid(AlternateProtocol protocol);
|
|
|
| enum AlternateProtocolSize {
|
| - NUM_VALID_ALTERNATE_PROTOCOLS =
|
| - ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION -
|
| - ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION + 1,
|
| + NUM_VALID_ALTERNATE_PROTOCOLS = ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION -
|
| + ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION +
|
| + 1,
|
| };
|
|
|
| NET_EXPORT const char* AlternateProtocolToString(AlternateProtocol protocol);
|
| -NET_EXPORT AlternateProtocol AlternateProtocolFromString(
|
| - const std::string& str);
|
| -NET_EXPORT_PRIVATE AlternateProtocol AlternateProtocolFromNextProto(
|
| - NextProto next_proto);
|
| +NET_EXPORT AlternateProtocol
|
| + AlternateProtocolFromString(const std::string& str);
|
| +NET_EXPORT_PRIVATE AlternateProtocol
|
| + AlternateProtocolFromNextProto(NextProto next_proto);
|
|
|
| struct NET_EXPORT PortAlternateProtocolPair {
|
| bool Equals(const PortAlternateProtocolPair& other) const {
|
| @@ -91,11 +91,11 @@ struct NET_EXPORT PortAlternateProtocolPair {
|
| AlternateProtocol protocol;
|
| };
|
|
|
| -typedef base::MRUCache<
|
| - HostPortPair, PortAlternateProtocolPair> AlternateProtocolMap;
|
| +typedef base::MRUCache<HostPortPair, PortAlternateProtocolPair>
|
| + AlternateProtocolMap;
|
| typedef base::MRUCache<HostPortPair, SettingsMap> SpdySettingsMap;
|
| -typedef std::map<HostPortPair,
|
| - HttpPipelinedHostCapability> PipelineCapabilityMap;
|
| +typedef std::map<HostPortPair, HttpPipelinedHostCapability>
|
| + PipelineCapabilityMap;
|
|
|
| extern const char kAlternateProtocolHeader[];
|
|
|
|
|