Index: chrome/browser/ssl/ssl_blocking_page.cc |
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc |
index fcab016e74494698a84148b99f4176deffa45c4e..4f5a119cb45b2ebc899ee11db1be7fffd644105b 100644 |
--- a/chrome/browser/ssl/ssl_blocking_page.cc |
+++ b/chrome/browser/ssl/ssl_blocking_page.cc |
@@ -517,6 +517,10 @@ void SSLBlockingPage::Observe( |
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 = |