Revert "Add histograms to track down the cause of ERR_SSL_PROTOCOL_ERROR."

net/socket/ssl_client_socket_openssl.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.
 
 // OpenSSL binding for SSLClientSocket. The class layout and general principle
 // of operation is derived from SSLClientSocketNSS.
 
 #include "net/socket/ssl_client_socket_openssl.h"
 
 #include <errno.h>
@@ skipping 1067 matching lines @@
   do {
     rv = BufferSend();
     if (rv != ERR_IO_PENDING && rv != 0)
       network_moved = true;
   } while (rv > 0);
   if (transport_read_error_ == OK && BufferRecv() != ERR_IO_PENDING)
     network_moved = true;
   return network_moved;
 }
 
-uint16_t SSLClientSocketOpenSSL::GetCipherSuite() {
-  const SSL_CIPHER* cipher = SSL_get_current_cipher(ssl_);
-  if (!cipher)
-    return 0;
-  return static_cast<uint16_t>(SSL_CIPHER_get_id(cipher));
-}
-
 // TODO(cbentzel): Remove including "base/threading/thread_local.h" and
 // g_first_run_completed once crbug.com/424386 is fixed.
 base::LazyInstance<base::ThreadLocalBoolean>::Leaky g_first_run_completed =
     LAZY_INSTANCE_INITIALIZER;
 
 int SSLClientSocketOpenSSL::DoHandshake() {
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
   int rv;
 
@@ skipping 66 matching lines @@
       ssl_failure_state_ = SSL_FAILURE_CLIENT_AUTH;
     } else if (ERR_GET_LIB(error_info.error_code) == ERR_LIB_SSL &&
                ERR_GET_REASON(error_info.error_code) ==
                    SSL_R_OLD_SESSION_VERSION_NOT_RETURNED) {
       ssl_failure_state_ = SSL_FAILURE_SESSION_MISMATCH;
     } else if (cipher && npn_status_ != kNextProtoUnsupported) {
       ssl_failure_state_ = SSL_FAILURE_NEXT_PROTO;
     } else {
       ssl_failure_state_ = SSL_FAILURE_UNKNOWN;
     }
-
-    // TODO(davidben): Remove this once https://crbug.com/593963 is resolved.
-    if (net_error == ERR_SSL_PROTOCOL_ERROR) {
-      UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSLProtocolErrorCipher.Connect",
-                                  GetCipherSuite());
-      UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSLProtocolErrorReason.Connect",
-                                  ERR_GET_REASON(error_info.error_code));
-    }
   }
 
   GotoState(STATE_HANDSHAKE_COMPLETE);
   return net_error;
 }
 
 int SSLClientSocketOpenSSL::DoHandshakeComplete(int result) {
   if (result < 0)
     return result;
 
@@ skipping 458 matching lines @@
     // No bytes were returned. Return the pending read error immediately.
     DCHECK_NE(kNoPendingResult, pending_read_error_);
     rv = pending_read_error_;
     pending_read_error_ = kNoPendingResult;
   }
 
   if (rv >= 0) {
     net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_RECEIVED, rv,
                                   user_read_buf_->data());
   } else if (rv != ERR_IO_PENDING) {
-    // TODO(davidben): Remove this once https://crbug.com/593963 is resolved.
-    if (rv == ERR_SSL_PROTOCOL_ERROR) {
-      UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSLProtocolErrorCipher.Read",
-                                  GetCipherSuite());
-      UMA_HISTOGRAM_SPARSE_SLOWLY(
-          "Net.SSLProtocolErrorReason.Read",
-          ERR_GET_REASON(pending_read_error_info_.error_code));
-    }
-
     net_log_.AddEvent(
         NetLog::TYPE_SSL_READ_ERROR,
         CreateNetLogOpenSSLErrorCallback(rv, pending_read_ssl_error_,
                                          pending_read_error_info_));
     pending_read_ssl_error_ = SSL_ERROR_NONE;
     pending_read_error_info_ = OpenSSLErrorInfo();
   }
   return rv;
 }
 
 int SSLClientSocketOpenSSL::DoPayloadWrite() {
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
   int rv = SSL_write(ssl_, user_write_buf_->data(), user_write_buf_len_);
 
   if (rv >= 0) {
     net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv,
                                   user_write_buf_->data());
     return rv;
   }
 
   int ssl_error = SSL_get_error(ssl_, rv);
   if (ssl_error == SSL_ERROR_WANT_PRIVATE_KEY_OPERATION)
     return ERR_IO_PENDING;
   OpenSSLErrorInfo error_info;
   int net_error = MapOpenSSLErrorWithDetails(ssl_error, err_tracer,
                                              &error_info);
 
   if (net_error != ERR_IO_PENDING) {
-    // TODO(davidben): Remove this once https://crbug.com/593963 is resolved.
-    if (net_error == ERR_SSL_PROTOCOL_ERROR) {
-      UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSLProtocolErrorCipher.Write",
-                                  GetCipherSuite());
-      UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSLProtocolErrorReason.Write",
-                                  ERR_GET_REASON(error_info.error_code));
-    }
-
     net_log_.AddEvent(
         NetLog::TYPE_SSL_WRITE_ERROR,
         CreateNetLogOpenSSLErrorCallback(net_error, ssl_error, error_info));
   }
   return net_error;
 }
 
 void SSLClientSocketOpenSSL::PumpReadWriteEvents() {
   int rv_read = ERR_IO_PENDING;
   int rv_write = ERR_IO_PENDING;
@@ skipping 625 matching lines @@
       tb_was_negotiated_ = true;
       return 1;
     }
   }
 
   *out_alert_value = SSL_AD_ILLEGAL_PARAMETER;
   return 0;
 }
 
 }  // namespace net