Update from https://crrev.com/306655

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"
 
 namespace net {
 
 // Status flags for SSLInfo::connection_status.
 enum {
   // The lower 16 bits are reserved for the TLS ciphersuite id.
-  SSL_CONNECTION_CIPHERSUITE_SHIFT = 0,
   SSL_CONNECTION_CIPHERSUITE_MASK = 0xffff,
 
   // The next two bits are reserved for the compression used.
   SSL_CONNECTION_COMPRESSION_SHIFT = 16,
   SSL_CONNECTION_COMPRESSION_MASK = 3,
 
   // We fell back to an older protocol version for this connection.
   SSL_CONNECTION_VERSION_FALLBACK = 1 << 18,
 
   // The server doesn't support the renegotiation_info extension. If this bit
@@ skipping 19 matching lines @@
   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);
 
-inline int SSLConnectionStatusToCipherSuite(int connection_status) {
-  return (connection_status >> SSL_CONNECTION_CIPHERSUITE_SHIFT) &
-         SSL_CONNECTION_CIPHERSUITE_MASK;
+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;
 }
 
-inline void SSLConnectionStatusSetCipherSuite(int cipher_suite,
+inline void SSLConnectionStatusSetCipherSuite(uint16 cipher_suite,
                                               int* connection_status) {
   // Clear out the old ciphersuite.
-  *connection_status &=
-      ~(SSL_CONNECTION_CIPHERSUITE_MASK << SSL_CONNECTION_CIPHERSUITE_SHIFT);
+  *connection_status &= ~SSL_CONNECTION_CIPHERSUITE_MASK;
   // Set the new ciphersuite.
-  *connection_status |= ((cipher_suite & SSL_CONNECTION_CIPHERSUITE_MASK)
-                         << SSL_CONNECTION_CIPHERSUITE_SHIFT);
+  *connection_status |= cipher_suite;
 }
 
 inline void SSLConnectionStatusSetVersion(int version, int* connection_status) {
   DCHECK_GT(version, 0);
   DCHECK_LT(version, SSL_CONNECTION_VERSION_MAX);
 
   // Clear out the old version.
   *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_