Move CaptivePortalDetector to src/components/captive_portal

chrome/browser/captive_portal/captive_portal_tab_reloader.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_tab_reloader.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/net_errors.h"
 
-namespace captive_portal {
+using captive_portal::CaptivePortalResult;
 
 namespace {
 
 // The time to wait for a slow loading SSL page before triggering a captive
 // portal check.
 const int kDefaultSlowSSLTimeSeconds = 30;
 
 // Returns true if an SSL request resulting in |error| may indicate a captive
 // portal.
 bool SslNetErrorMayImplyCaptivePortal(int error) {
@@ skipping 91 matching lines @@
     return;
   // Only start the SSL timer running if no SSL URL has been seen in the current
   // redirect chain.  If we've already successfully downloaded one SSL URL,
   // assume we're not behind a captive portal.
   if (!ssl_url_in_redirect_chain_)
     SetState(STATE_TIMER_RUNNING);
   ssl_url_in_redirect_chain_ = true;
 }
 
 void CaptivePortalTabReloader::OnCaptivePortalResults(
-    Result previous_result,
-    Result result) {
-  if (result == RESULT_BEHIND_CAPTIVE_PORTAL) {
+    CaptivePortalResult previous_result,
+    CaptivePortalResult result) {
+  if (result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL) {
     if (state_ == STATE_MAYBE_BROKEN_BY_PORTAL) {
       SetState(STATE_BROKEN_BY_PORTAL);
       MaybeOpenCaptivePortalLoginTab();
     }
     return;
   }
 
   switch (state_) {
     case STATE_MAYBE_BROKEN_BY_PORTAL:
     case STATE_TIMER_RUNNING:
       // If the previous result was BEHIND_CAPTIVE_PORTAL, and the state is
       // either STATE_MAYBE_BROKEN_BY_PORTAL or STATE_TIMER_RUNNING, reload the
       // tab.  In the latter case, the tab has yet to commit, but is an SSL
       // page, so if the page ends up at an error caused by a captive portal, it
       // will be reloaded.  If not, the state will just be reset.  The helps in
       // the case that a user tries to reload a tab, and then quickly logs in.
-      if (previous_result == RESULT_BEHIND_CAPTIVE_PORTAL) {
+      if (previous_result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL) {
         SetState(STATE_NEEDS_RELOAD);
         return;
       }
       SetState(STATE_NONE);
       return;
 
     case STATE_BROKEN_BY_PORTAL:
       // Either reload the tab now, if an error page has already been committed
       // or an interstitial is being displayed, or reload it if and when a
       // timeout commits.
@@ skipping 112 matching lines @@
 void CaptivePortalTabReloader::MaybeOpenCaptivePortalLoginTab() {
   open_login_tab_callback_.Run();
 }
 
 void CaptivePortalTabReloader::CheckForCaptivePortal() {
   CaptivePortalService* service =
       CaptivePortalServiceFactory::GetForProfile(profile_);
   if (service)
     service->DetectCaptivePortal();
 }
-
-}  // namespace captive_portal