Add logging for distinguishing between captive portals with HTTP and HTTPS login pages

chrome/browser/captive_portal/captive_portal_service.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 "chrome/browser/captive_portal/captive_portal_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 191 matching lines @@
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(STATE_CHECKING_FOR_PORTAL, state_);
   DCHECK(!TimerRunning());
   DCHECK(enabled_);
 
   Result result = results.result;
   const base::TimeDelta& retry_after_delta = results.retry_after_delta;
   base::TimeTicks now = GetCurrentTimeTicks();
 
   // Record histograms.
-  UMA_HISTOGRAM_ENUMERATION("CaptivePortal.DetectResult",
-                            result,
-                            RESULT_COUNT);
+  if (!results.landing_url.SchemeIs("https") ||
+      result == RESULT_INTERNET_CONNECTED) {
+    UMA_HISTOGRAM_ENUMERATION("CaptivePortal.DetectResult",
+                              result,
+                              RESULT_COUNT + 2);
+  } else {
+    // Record HTTPS login pages separately for RESULT_NO_RESPONSE
+    // and RESULT_BEHIND_CAPTIVE_PORTAL.
+    UMA_HISTOGRAM_ENUMERATION("CaptivePortal.DetectResult",
+                              result + 2,
+                              RESULT_COUNT + 2);

[mmenke, 2014/03/26 17:23:21]

The +2 strikes me as fragile.  If this histogram isn't going to be long lived,
I'm fine with this, but otherwise, should probably do something more robust,
like having another enum and mapping results manually.

[meacer, 2014/03/26 17:59:32]

I guess we can keep it for some time, so I extracted it into something a bit
more robust.

+  }
 
   // If this isn't the first captive portal result, record stats.
   if (!last_check_time_.is_null()) {
     UMA_HISTOGRAM_LONG_TIMES("CaptivePortal.TimeBetweenChecks",
                              now - last_check_time_);
 
     if (last_detection_result_ != result) {
       // If the last result was different from the result of the latest test,
       // record histograms about the previous period over which the result was
       // the same.
@@ skipping 113 matching lines @@
 
 bool CaptivePortalService::DetectionInProgress() const {
   return state_ == STATE_CHECKING_FOR_PORTAL;
 }
 
 bool CaptivePortalService::TimerRunning() const {
   return check_captive_portal_timer_.IsRunning();
 }
 
 }  // namespace captive_portal