Align SSLClientSocketOpenSSL and SSLClientSocketNSS histograms.

net/socket/ssl_client_socket_pool.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.
 
 #include "net/socket/ssl_client_socket_pool.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 483 matching lines @@
                                base::TimeDelta::FromMinutes(1),
                                100);
 
     SSLInfo ssl_info;
     ssl_socket_->GetSSLInfo(&ssl_info);
 
     UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_CipherSuite",
                                 SSLConnectionStatusToCipherSuite(
                                     ssl_info.connection_status));
 
+    if (ssl_info.connection_status &
+        SSL_CONNECTION_NO_RENEGOTIATION_EXTENSION) {
+      UMA_HISTOGRAM_ENUMERATION("Net.RenegotiationExtensionSupported", 0, 2);
+    } else {
+      UMA_HISTOGRAM_ENUMERATION("Net.RenegotiationExtensionSupported", 1, 2);

[Alexei Svitkine (slow), 2014/08/22 18:49:14]

Nit: Can you just use an UMA_HISTOGRAM_BOOLEAN() here?

Also, can you refactor to have a single macro invocation for the same histogram?
Each macro expands to a bunch of code, so fewer of them results in less bloat.

[davidben, 2014/08/22 23:03:20]

Done. Though, that should be flipped back if it isn't safe to flip an existing
0/1 enumeration to a boolean. (Is it? This isn't an new histogram.)

[Alexei Svitkine (slow), 2014/08/24 15:49:20]

The two are equivalent in terms of what gets sent up.

+    }
+
     if (ssl_info.handshake_type == SSLInfo::HANDSHAKE_RESUME) {
       UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_Resume_Handshake",
                                  connect_duration,
                                  base::TimeDelta::FromMilliseconds(1),
                                  base::TimeDelta::FromMinutes(1),
                                  100);
     } else if (ssl_info.handshake_type == SSLInfo::HANDSHAKE_FULL) {
       UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_Full_Handshake",
                                  connect_duration,
                                  base::TimeDelta::FromMilliseconds(1),
@@ skipping 306 matching lines @@
   if (base_.CloseOneIdleSocket())
     return true;
   return base_.CloseOneIdleConnectionInHigherLayeredPool();
 }
 
 void SSLClientSocketPool::OnSSLConfigChanged() {
   FlushWithError(ERR_NETWORK_CHANGED);
 }
 
 }  // namespace net