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 4f5a119cb45b2ebc899ee11db1be7fffd644105b..1688494f46c347849b8715910030e993395b3996 100644 |
--- a/chrome/browser/ssl/ssl_blocking_page.cc |
+++ b/chrome/browser/ssl/ssl_blocking_page.cc |
@@ -49,6 +49,7 @@ |
using base::ASCIIToUTF16; |
using base::TimeTicks; |
+using captive_portal::CaptivePortalDetector; |
using content::InterstitialPage; |
using content::NavigationController; |
using content::NavigationEntry; |
@@ -229,8 +230,8 @@ SSLBlockingPage::SSLBlockingPage( |
} |
#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) |
- captive_portal::CaptivePortalService* captive_portal_service = |
- captive_portal::CaptivePortalServiceFactory::GetForProfile(profile); |
+ CaptivePortalService* captive_portal_service = |
+ CaptivePortalServiceFactory::GetForProfile(profile); |
captive_portal_detection_enabled_ = captive_portal_service ->enabled(); |
captive_portal_service ->DetectCaptivePortal(); |
registrar_.Add(this, |
@@ -523,8 +524,8 @@ void SSLBlockingPage::Observe( |
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>( |
+ 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. |