Update from https://crrev.com/312398

net/http/http_server_properties.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_server_properties.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/ssl/ssl_config.h"
 
 namespace net {
 
 const char kAlternateProtocolHeader[] = "Alternate-Protocol";
 
 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-14",  // HTTP/2 draft-14. Called SPDY4 internally.
   "npn-h2-15",  // HTTP/2 draft-15. Called SPDY4 internally.
   "quic"
 };
 
-COMPILE_ASSERT(
-    arraysize(kAlternateProtocolStrings) == NUM_VALID_ALTERNATE_PROTOCOLS,
-    kAlternateProtocolStringsSize_kNumValidAlternateProtocols_not_equal);
+static_assert(arraysize(kAlternateProtocolStrings) ==
+                  NUM_VALID_ALTERNATE_PROTOCOLS,
+              "kAlternateProtocolStrings has incorrect size");
 
 }  // namespace
 
 void HistogramAlternateProtocolUsage(AlternateProtocolUsage usage) {
   UMA_HISTOGRAM_ENUMERATION("Net.AlternateProtocolUsage", usage,
                             ALTERNATE_PROTOCOL_USAGE_MAX);
 }
 
 void HistogramBrokenAlternateProtocolLocation(
     BrokenAlternateProtocolLocation location){
@@ skipping 65 matching lines @@
                             is_broken ? " (broken)" : "");
 }
 
 // static
 void HttpServerProperties::ForceHTTP11(SSLConfig* ssl_config) {
   ssl_config->next_protos.clear();
   ssl_config->next_protos.push_back(kProtoHTTP11);
 }
 
 }  // namespace net