| Index: net/http/http_server_properties.cc
|
| diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc
|
| index 5f2bf092c7ee5d36141ea8edbba6a5b1f42d1062..5d51144979248bd26cccb58dcc5f2914a2a0631d 100644
|
| --- a/net/http/http_server_properties.cc
|
| +++ b/net/http/http_server_properties.cc
|
| @@ -17,12 +17,9 @@ namespace {
|
| // The order of these strings much match the order of the enum definition
|
| // for AlternateProtocol.
|
| const char* const kAlternateProtocolStrings[] = {
|
| - "npn-spdy/2",
|
| - "npn-spdy/3",
|
| - "npn-spdy/3.1",
|
| - "npn-h2-11", // HTTP/2 draft 11. Called SPDY4 internally.
|
| - "quic"
|
| -};
|
| + "npn-spdy/2", "npn-spdy/3", "npn-spdy/3.1",
|
| + "npn-h2-11", // HTTP/2 draft 11. Called SPDY4 internally.
|
| + "quic"};
|
| const char kBrokenAlternateProtocol[] = "Broken";
|
|
|
| COMPILE_ASSERT(
|
| @@ -32,19 +29,20 @@ COMPILE_ASSERT(
|
| } // namespace
|
|
|
| void HistogramAlternateProtocolUsage(AlternateProtocolUsage usage) {
|
| - UMA_HISTOGRAM_ENUMERATION("Net.AlternateProtocolUsage", usage,
|
| - ALTERNATE_PROTOCOL_USAGE_MAX);
|
| + UMA_HISTOGRAM_ENUMERATION(
|
| + "Net.AlternateProtocolUsage", usage, ALTERNATE_PROTOCOL_USAGE_MAX);
|
| }
|
|
|
| void HistogramBrokenAlternateProtocolLocation(
|
| - BrokenAlternateProtocolLocation location){
|
| - UMA_HISTOGRAM_ENUMERATION("Net.AlternateProtocolBrokenLocation", location,
|
| + BrokenAlternateProtocolLocation location) {
|
| + UMA_HISTOGRAM_ENUMERATION("Net.AlternateProtocolBrokenLocation",
|
| + location,
|
| BROKEN_ALTERNATE_PROTOCOL_LOCATION_MAX);
|
| }
|
|
|
| bool IsAlternateProtocolValid(AlternateProtocol protocol) {
|
| return protocol >= ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION &&
|
| - protocol <= ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION;
|
| + protocol <= ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION;
|
| }
|
|
|
| const char* AlternateProtocolToString(AlternateProtocol protocol) {
|
| @@ -55,8 +53,8 @@ const char* AlternateProtocolToString(AlternateProtocol protocol) {
|
| case NPN_SPDY_4:
|
| case QUIC:
|
| DCHECK(IsAlternateProtocolValid(protocol));
|
| - return kAlternateProtocolStrings[
|
| - protocol - ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION];
|
| + return kAlternateProtocolStrings
|
| + [protocol - ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION];
|
| case ALTERNATE_PROTOCOL_BROKEN:
|
| return kBrokenAlternateProtocol;
|
| case UNINITIALIZED_ALTERNATE_PROTOCOL:
|
| @@ -68,7 +66,8 @@ const char* AlternateProtocolToString(AlternateProtocol protocol) {
|
|
|
| AlternateProtocol AlternateProtocolFromString(const std::string& str) {
|
| for (int i = ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION;
|
| - i <= ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION; ++i) {
|
| + i <= ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION;
|
| + ++i) {
|
| AlternateProtocol protocol = static_cast<AlternateProtocol>(i);
|
| if (str == AlternateProtocolToString(protocol))
|
| return protocol;
|
| @@ -101,8 +100,7 @@ AlternateProtocol AlternateProtocolFromNextProto(NextProto next_proto) {
|
| }
|
|
|
| std::string PortAlternateProtocolPair::ToString() const {
|
| - return base::StringPrintf("%d:%s", port,
|
| - AlternateProtocolToString(protocol));
|
| + return base::StringPrintf("%d:%s", port, AlternateProtocolToString(protocol));
|
| }
|
|
|
| } // namespace net
|
|
|