Move CaptivePortalDetector to src/components/captive_portal

chrome/browser/captive_portal/captive_portal_tab_helper.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_HELPER_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "webkit/common/resource_type.h"
 
 class GURL;
 class Profile;
 
 namespace content {
   class WebContents;
 }
 
 namespace net {
 class SSLInfo;
 }
 
-namespace captive_portal {
-
 class CaptivePortalLoginDetector;
 class CaptivePortalTabReloader;
 
 // Along with the classes it owns, responsible for detecting page loads broken
 // by a captive portal, triggering captive portal checks on navigation events
 // that may indicate a captive portal is present, or has been removed / logged
 // in to, and taking any correcting actions.
 //
 // It acts as a WebContentsObserver for its CaptivePortalLoginDetector and
 // CaptivePortalTabReloader.  It filters out non-main-frame resource loads, and
@@ skipping 74 matching lines @@
 
   friend class content::WebContentsUserData<CaptivePortalTabHelper>;
   explicit CaptivePortalTabHelper(content::WebContents* web_contents);
 
   // Called by Observe in response to the corresponding event.
   void OnRedirect(int child_id,
                   ResourceType::Type resource_type,
                   const GURL& new_url);
 
   // Called by Observe in response to the corresponding event.
-  void OnCaptivePortalResults(Result previous_result, Result result);
+  void OnCaptivePortalResults(
+      captive_portal::CaptivePortalResult previous_result,
+      captive_portal::CaptivePortalResult result);
 
   void OnLoadAborted();
 
   // Called to indicate a tab is at, or is navigating to, the captive portal
   // login page.
   void SetIsLoginTab();
 
   // |this| takes ownership of |tab_reloader|.
   void SetTabReloaderForTest(CaptivePortalTabReloader* tab_reloader);
 
@@ skipping 23 matching lines @@
   // the currently displayed RenderViewHost or a pending RenderViewHost for
   // cross-process navitations.  NULL when there's currently no provisional
   // load.
   content::RenderViewHost* provisional_render_view_host_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalTabHelper);
 };
 
-}  // namespace captive_portal
-
 #endif  // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_