Use stricter type checking in UMA_HISTOGRAM_ENUMERATION

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 74 matching lines @@
   base::HistogramBase* result_duration_histogram =
       base::Histogram::FactoryTimeGet(
           "CaptivePortal.ResultDuration." + CaptivePortalResultToString(result),
           base::TimeDelta::FromSeconds(1),  // min
           base::TimeDelta::FromHours(1),  // max
           50,  // bucket_count
           base::Histogram::kUmaTargetedHistogramFlag);
   result_duration_histogram->AddTime(result_duration);
 }
 
-int GetHistogramEntryForDetectionResult(
+CaptivePortalDetectionResult GetHistogramEntryForDetectionResult(
     const captive_portal::CaptivePortalDetector::Results& results) {
   bool is_https = results.landing_url.SchemeIs("https");
   bool is_ip = results.landing_url.HostIsIPAddress();
   switch (results.result) {
     case captive_portal::RESULT_INTERNET_CONNECTED:
       return DETECTION_RESULT_INTERNET_CONNECTED;
     case captive_portal::RESULT_NO_RESPONSE:
       if (is_ip) {
         return is_https ?
             DETECTION_RESULT_NO_RESPONSE_HTTPS_LANDING_URL_IP_ADDRESS :
             DETECTION_RESULT_NO_RESPONSE_IP_ADDRESS;
       }
       return is_https ?
           DETECTION_RESULT_NO_RESPONSE_HTTPS_LANDING_URL :
           DETECTION_RESULT_NO_RESPONSE;
     case captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL:
       if (is_ip) {
         return is_https ?
           DETECTION_RESULT_BEHIND_CAPTIVE_PORTAL_HTTPS_LANDING_URL_IP_ADDRESS :
           DETECTION_RESULT_BEHIND_CAPTIVE_PORTAL_IP_ADDRESS;
       }
       return is_https ?
           DETECTION_RESULT_BEHIND_CAPTIVE_PORTAL_HTTPS_LANDING_URL :
           DETECTION_RESULT_BEHIND_CAPTIVE_PORTAL;
     default:
       NOTREACHED();
-      return -1;
+      return DETECTION_RESULT_COUNT;
   }
 }
 
 bool ShouldDeferToNativeCaptivePortalDetection() {
   // On Windows 8, defer to the native captive portal detection.  OSX Lion and
   // later also have captive portal detection, but experimentally, this code
   // works in cases its does not.
   //
   // TODO(mmenke): Investigate how well Windows 8's captive portal detection
   // works.
@@ skipping 283 matching lines @@
   return base::TimeTicks::Now();
 }
 
 bool CaptivePortalService::DetectionInProgress() const {
   return state_ == STATE_CHECKING_FOR_PORTAL;
 }
 
 bool CaptivePortalService::TimerRunning() const {
   return check_captive_portal_timer_.IsRunning();
 }