Move CaptivePortalDetector to src/components/captive_portal

chrome/browser/chromeos/net/network_portal_detector.h

 // Copyright (c) 2013 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_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_H_
 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_H_
 
 #include "base/basictypes.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
+#include "components/captive_portal/captive_portal_types.h"
 #include "net/url_request/url_fetcher.h"
 
 namespace chromeos {
 
 class NetworkState;
 
 // This class handles all notifications about network changes from
 // NetworkStateHandler and delegates portal detection for the active
 // network to CaptivePortalService.
 class NetworkPortalDetector : public ErrorScreen::Observer {
  public:
-  enum CaptivePortalStatus {
-    CAPTIVE_PORTAL_STATUS_UNKNOWN  = 0,
-    CAPTIVE_PORTAL_STATUS_OFFLINE  = 1,
-    CAPTIVE_PORTAL_STATUS_ONLINE   = 2,
-    CAPTIVE_PORTAL_STATUS_PORTAL   = 3,
-    CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED = 4,
-    CAPTIVE_PORTAL_STATUS_COUNT
-  };
-
   struct CaptivePortalState {
     CaptivePortalState()
-        : status(CAPTIVE_PORTAL_STATUS_UNKNOWN),
+        : status(captive_portal::CAPTIVE_PORTAL_STATUS_UNKNOWN),
           response_code(net::URLFetcher::RESPONSE_CODE_INVALID) {
     }
 
     bool operator==(const CaptivePortalState& o) const {
       return status == o.status && response_code == o.response_code;
     }
 
-    CaptivePortalStatus status;
+    captive_portal::CaptivePortalStatus status;
     int response_code;
     base::TimeTicks time;
   };
 
   class Observer {
    public:
     // Called when portal detection is completed for |network|, or
     // when observers add themselves via AddAndFireObserver(). In the
     // second case, |network| is the active network and |state| is a
     // current portal state for the active network, which can be
@@ skipping 59 matching lines @@
 
   // Deletes the instance of the NetworkPortalDetector.
   static void Shutdown();
 
   // Gets the instance of the NetworkPortalDetector. Return value should
   // be used carefully in tests, because it can be changed "on the fly"
   // by calls to InitializeForTesting().
   static NetworkPortalDetector* Get();
 
   // Returns non-localized string representation of |status|.
-  static std::string CaptivePortalStatusString(CaptivePortalStatus status);
+  static std::string CaptivePortalStatusString(
+      captive_portal::CaptivePortalStatus status);
 
   // Returns |true| if NetworkPortalDetector was Initialized and it is safe to
   // call Get.
   static bool IsInitialized();
 
  protected:
   NetworkPortalDetector() {}
   virtual ~NetworkPortalDetector() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetector);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_H_