Update from https://crrev.com/312398

net/ssl/ssl_connection_status_flags.h

 // 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.
 
 #ifndef NET_SSL_SSL_CONNECTION_STATUS_FLAGS_H_
 #define NET_SSL_SSL_CONNECTION_STATUS_FLAGS_H_
 
 #include "base/logging.h"
 #include "base/macros.h"
 
@@ skipping 31 matching lines @@
   SSL_CONNECTION_VERSION_UNKNOWN = 0,  // Unknown SSL version.
   SSL_CONNECTION_VERSION_SSL2 = 1,
   SSL_CONNECTION_VERSION_SSL3 = 2,
   SSL_CONNECTION_VERSION_TLS1 = 3,
   SSL_CONNECTION_VERSION_TLS1_1 = 4,
   SSL_CONNECTION_VERSION_TLS1_2 = 5,
   // Reserve 6 for TLS 1.3.
   SSL_CONNECTION_VERSION_QUIC = 7,
   SSL_CONNECTION_VERSION_MAX,
 };
-COMPILE_ASSERT(SSL_CONNECTION_VERSION_MAX - 1 <= SSL_CONNECTION_VERSION_MASK,
-               SSL_CONNECTION_VERSION_MASK_too_small);
+static_assert(SSL_CONNECTION_VERSION_MAX - 1 <= SSL_CONNECTION_VERSION_MASK,
+              "SSL_CONNECTION_VERSION_MASK too small");
 
 inline uint16 SSLConnectionStatusToCipherSuite(int connection_status) {
   return static_cast<uint16>(connection_status);
 }
 
 inline int SSLConnectionStatusToVersion(int connection_status) {
   return (connection_status >> SSL_CONNECTION_VERSION_SHIFT) &
          SSL_CONNECTION_VERSION_MASK;
 }
 
@@ skipping 13 matching lines @@
   *connection_status &=
       ~(SSL_CONNECTION_VERSION_MASK << SSL_CONNECTION_VERSION_SHIFT);
   // Set the new version.
   *connection_status |=
       ((version & SSL_CONNECTION_VERSION_MASK) << SSL_CONNECTION_VERSION_SHIFT);
 }
 
 }  // namespace net
 
 #endif  // NET_SSL_SSL_CONNECTION_STATUS_FLAGS_H_