Fix captive portal histogram in SSL interstitials.

chrome/browser/ssl/ssl_error_classification.cc

Index: chrome/browser/ssl/ssl_error_classification.cc
diff --git a/chrome/browser/ssl/ssl_error_classification.cc b/chrome/browser/ssl/ssl_error_classification.cc
index 03a715244ac829948d4bd440dc3c2ea02a103672..eea89250afa724677523c9a09e001a80b2e5b6ae 100644
--- a/chrome/browser/ssl/ssl_error_classification.cc
+++ b/chrome/browser/ssl/ssl_error_classification.cc
@@ -60,6 +60,7 @@ enum SSLInterstitialCause {
 
 // Events for UMA. Do not reorder or change!
 enum SSLInterstitialCauseCaptivePortal {
+  CAPTIVE_PORTAL_ALL,

[felt, 2015/02/12 01:35:37]

All older data will get bucketed incorrectly as a result. For example if you
were to look at all channels next week you'd see a mix of the two different
histograms and it would lead to really messy data. I recommend either adding ALL
at the end, or defining a new histogram for this.

   CAPTIVE_PORTAL_DETECTION_ENABLED,
   CAPTIVE_PORTAL_DETECTION_ENABLED_OVERRIDABLE,
   CAPTIVE_PORTAL_PROBE_COMPLETED,
@@ -148,6 +149,7 @@ SSLErrorClassification::~SSLErrorClassification() { }
 void SSLErrorClassification::RecordCaptivePortalUMAStatistics(
     bool overridable) const {
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
+  RecordCaptivePortalEventStats(CAPTIVE_PORTAL_ALL);
   if (captive_portal_detection_enabled_)
     RecordCaptivePortalEventStats(
         overridable ?