Revert "Roll src/third_party/boringssl/src 0d81373f9..1991af690" (https://codereview.chromium.org/2…

net/socket/ssl_server_socket_unittest.cc

Index: net/socket/ssl_server_socket_unittest.cc
diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc
index 8f22947a22b405e0626a7144857e6e1e84de5e52..82c8f35171a583b302dd28c63d06274a33206309 100644
--- a/net/socket/ssl_server_socket_unittest.cc
+++ b/net/socket/ssl_server_socket_unittest.cc
@@ -549,19 +549,17 @@ TEST_F(SSLServerSocketTest, Handshake) {
   ASSERT_TRUE(client_socket_->GetSSLInfo(&ssl_info));
   EXPECT_EQ(CERT_STATUS_AUTHORITY_INVALID, ssl_info.cert_status);
 
-  // The default cipher suite should be ECDHE and an AEAD.
+  // The default cipher suite should be ECDHE and, unless on NSS and the
+  // platform doesn't support it, an AEAD.
   uint16_t cipher_suite =
       SSLConnectionStatusToCipherSuite(ssl_info.connection_status);
   const char* key_exchange;
   const char* cipher;
   const char* mac;
   bool is_aead;
-  bool is_tls13;
-  SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, &is_aead, &is_tls13,
-                          cipher_suite);
-  EXPECT_TRUE(is_aead);
-  ASSERT_FALSE(is_tls13);
+  SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, &is_aead, cipher_suite);
   EXPECT_STREQ("ECDHE_RSA", key_exchange);
+  EXPECT_TRUE(is_aead);
 }
 
 // This test makes sure the session cache is working.