Update from chromium https://crrev.com/301315

net/socket/ssl_client_socket_nss.cc

Index: net/socket/ssl_client_socket_nss.cc
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index 7366c166fb788ead37d83937a4121f82bfa02c47..e20b28a3512b05b67dbfbbc2a9a4d05a9f7fc206 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -1794,6 +1794,11 @@ int SSLClientSocketNSS::Core::DoWriteLoop(int result) {
 }
 
 int SSLClientSocketNSS::Core::DoHandshake() {
+  // TODO(vadimt): Remove ScopedProfile below once crbug.com/424386 is fixed.
+  tracked_objects::ScopedProfile tracking_profile(
+      FROM_HERE_WITH_EXPLICIT_FUNCTION(
+          "424386 SSLClientSocketNSS::Core::DoHandshake"));
+
   DCHECK(OnNSSTaskRunner());
 
   int net_error = OK;
@@ -1845,6 +1850,11 @@ int SSLClientSocketNSS::Core::DoHandshake() {
 }
 
 int SSLClientSocketNSS::Core::DoGetDBCertComplete(int result) {
+  // TODO(vadimt): Remove ScopedProfile below once crbug.com/424386 is fixed.
+  tracked_objects::ScopedProfile tracking_profile(
+      FROM_HERE_WITH_EXPLICIT_FUNCTION(
+          "424386 SSLClientSocketNSS::Core::DoGetDBCertComplete"));
+
   SECStatus rv;
   PostOrRunCallback(
       FROM_HERE,
@@ -2029,6 +2039,11 @@ int SSLClientSocketNSS::Core::DoPayloadWrite() {
 // transport socket. Return true if some I/O performed, false
 // otherwise (error or ERR_IO_PENDING).
 bool SSLClientSocketNSS::Core::DoTransportIO() {
+  // TODO(vadimt): Remove ScopedProfile below once crbug.com/424386 is fixed.
+  tracked_objects::ScopedProfile tracking_profile(
+      FROM_HERE_WITH_EXPLICIT_FUNCTION(
+          "424386 SSLClientSocketNSS::Core::DoTransportIO"));
+
   DCHECK(OnNSSTaskRunner());
 
   bool network_moved = false;
@@ -2438,6 +2453,10 @@ void SSLClientSocketNSS::Core::UpdateStapledOCSPResponse() {
 }
 
 void SSLClientSocketNSS::Core::UpdateConnectionStatus() {
+  // Note: This function may be called multiple times for a single connection
+  // if renegotiations occur.
+  nss_handshake_state_.ssl_connection_status = 0;
+
   SSLChannelInfo channel_info;
   SECStatus ok = SSL_GetChannelInfo(nss_fd_,
                                     &channel_info, sizeof(channel_info));