Don't log captive portal events in SSL interstitial if detection is disabled.

chrome/browser/ssl/ssl_blocking_page.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/ssl/ssl_blocking_page.h"
 
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
@@ skipping 499 matching lines @@
                                         int num_visits,
                                         base::Time first_visit) {
   num_visits_ = num_visits;
 }
 
 void SSLBlockingPage::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
+  // 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;
     captive_portal::CaptivePortalService::Results* results =
         content::Details<captive_portal::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 portal 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
 }