Use DCHECKs when observing only a single notification.

chrome/browser/ssl/captive_portal_metrics_recorder.cc

 // Copyright 2015 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/ssl/captive_portal_metrics_recorder.h"
 
 #include <vector>
 
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 63 matching lines @@
   else if (captive_portal_no_response_)
     RecordCaptivePortalEventStats(overridable_
                                       ? CAPTIVE_PORTAL_NO_RESPONSE_OVERRIDABLE
                                       : CAPTIVE_PORTAL_NO_RESPONSE);
 }
 
 void CaptivePortalMetricsRecorder::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
+  DCHECK_EQ(chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT, type);
+
   // When detection is disabled, captive portal service always sends
   // RESULT_INTERNET_CONNECTED. Ignore any probe results in that case.
   if (!captive_portal_detection_enabled_)
     return;
-  if (type == chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT) {
-    captive_portal_probe_completed_ = true;
-    CaptivePortalService::Results* results =
-        content::Details<CaptivePortalService::Results>(details).ptr();
-    // If a captive portal was detected at any point when the interstitial was
-    // displayed, assume that the interstitial was caused by a captive portal.
-    // Example scenario:
-    // 1- Interstitial displayed and captive portal detected, setting the flag.
-    // 2- Captive portal detection automatically opens portal login page.
-    // 3- User logs in on the portal login page.
-    // A notification will be received here for RESULT_INTERNET_CONNECTED. Make
-    // 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);
-  }
+
+  captive_portal_probe_completed_ = true;
+  CaptivePortalService::Results* results =
+      content::Details<CaptivePortalService::Results>(details).ptr();
+  // If a captive portal was detected at any point when the interstitial was
+  // displayed, assume that the interstitial was caused by a captive portal.
+  // Example scenario:
+  // 1- Interstitial displayed and captive portal detected, setting the flag.
+  // 2- Captive portal detection automatically opens portal login page.
+  // 3- User logs in on the portal login page.
+  // A notification will be received here for RESULT_INTERNET_CONNECTED. Make
+  // 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);
 }