Fix captive portal histogram in SSL interstitials.

chrome/browser/ssl/ssl_error_classification.cc

 // Copyright 2014 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 <vector>
 
 #include "chrome/browser/ssl/ssl_error_classification.h"
 
 #include "base/build_time.h"
 #include "base/metrics/field_trial.h"
@@ skipping 42 matching lines @@
   LOCALHOST,
   PRIVATE_URL,
   AUTHORITY_ERROR_CAPTIVE_PORTAL,
   SELF_SIGNED,
   EXPIRED_RECENTLY,
   UNUSED_INTERSTITIAL_CAUSE_ENTRY,
 };
 
 // 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,
   CAPTIVE_PORTAL_PROBE_COMPLETED_OVERRIDABLE,
   CAPTIVE_PORTAL_NO_RESPONSE,
   CAPTIVE_PORTAL_NO_RESPONSE_OVERRIDABLE,
   CAPTIVE_PORTAL_DETECTED,
   CAPTIVE_PORTAL_DETECTED_OVERRIDABLE,
   UNUSED_CAPTIVE_PORTAL_EVENT,
 };
@@ skipping 68 matching lines @@
                  chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT,
                  content::Source<Profile>(profile));
 #endif
 }
 
 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 ?
         CAPTIVE_PORTAL_DETECTION_ENABLED_OVERRIDABLE :
         CAPTIVE_PORTAL_DETECTION_ENABLED);
   if (captive_portal_probe_completed_)
     RecordCaptivePortalEventStats(
         overridable ?
         CAPTIVE_PORTAL_PROBE_COMPLETED_OVERRIDABLE :
         CAPTIVE_PORTAL_PROBE_COMPLETED);
@@ skipping 330 matching lines @@
     // sure we don't clear the captive protal flag, since the interstitial was
     // potentially caused by the captive portal.
     captive_portal_detected_ = captive_portal_detected_ ||
         (results->result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL);
     // Also keep track of non-HTTP portals and error cases.
     captive_portal_no_response_ = captive_portal_no_response_ ||
         (results->result == captive_portal::RESULT_NO_RESPONSE);
   }
 #endif
 }