Move CaptivePortalDetector to src/components/captive_portal

chrome/browser/captive_portal/captive_portal_tab_reloader.h

 // 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.
 
 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_RELOADER_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_RELOADER_H_
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 
 class Profile;
 
 namespace content {
 class WebContents;
 }
 
 namespace net {
 class SSLInfo;
 }
 
-namespace captive_portal {
-
 // Keeps track of whether a tab has encountered a navigation error caused by a
 // captive portal.  Also triggers captive portal checks when a page load may
 // have been broken or be taking longer due to a captive portal.  All methods
 // may only be called on the UI thread.
 //
 // Only supports SSL main frames which end at error pages as a result of
 // captive portals, since these make for a particularly bad user experience.
 // Non-SSL requests are intercepted by captive portals, which take users to the
 // login page.  SSL requests, however, may be silently blackholed, or result
 // in a variety of error pages, and will continue to do so if a user tries to
@@ skipping 61 matching lines @@
   virtual void OnLoadCommitted(int net_error);
 
   // This is called when the current provisional main frame load is canceled.
   // Sets state to STATE_NONE, unless this is a login tab.
   virtual void OnAbort();
 
   // Called whenever a provisional load to the main frame is redirected.
   virtual void OnRedirect(bool is_ssl);
 
   // Called whenever a captive portal test completes.
-  virtual void OnCaptivePortalResults(Result previous_result, Result result);
+  virtual void OnCaptivePortalResults(
+      captive_portal::CaptivePortalResult previous_result,
+      captive_portal::CaptivePortalResult result);
 
   // Called on certificate errors, which often indicate a captive portal.
   void OnSSLCertError(const net::SSLInfo& ssl_info);
 
  protected:
   // The following functions are used only when testing:
 
   State state() const { return state_; }
 
   content::WebContents* web_contents() { return web_contents_; }
@@ skipping 56 matching lines @@
   // portal check.
   base::TimeDelta slow_ssl_load_time_;
 
   const OpenLoginTabCallback open_login_tab_callback_;
 
   base::WeakPtrFactory<CaptivePortalTabReloader> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalTabReloader);
 };
 
-}  // namespace captive_portal
-
 #endif  // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_RELOADER_H_