Move CaptivePortalDetector to src/components/captive_portal

chrome/browser/ui/webui/chromeos/login/network_state_informer.cc

Index: chrome/browser/ui/webui/chromeos/login/network_state_informer.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc b/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc
index 1c20bd1c3e3fde6fcd66d8260d0f79ef3ca6795e..3bca8ae539864be034fd7520d1095996a9ab141d 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc
@@ -50,26 +50,26 @@ NetworkStateInformer::State GetStateForDefaultNetwork() {
   if (NetworkPortalDetector::Get()->IsEnabled()) {
     NetworkPortalDetector::CaptivePortalState state =
         NetworkPortalDetector::Get()->GetCaptivePortalState(network->path());
-    NetworkPortalDetector::CaptivePortalStatus status = state.status;
-    if (status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN &&
+    captive_portal::CaptivePortalStatus status = state.status;
+    if (status == captive_portal::CAPTIVE_PORTAL_STATUS_UNKNOWN &&
         NetworkState::StateIsConnecting(network->connection_state())) {
       return NetworkStateInformer::CONNECTING;
     }
     // For proxy-less networks rely on shill's online state if
     // NetworkPortalDetector's state of current network is unknown.
-    if (status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE ||
-        (status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN &&
+    if (status == captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE ||
+        (status == captive_portal::CAPTIVE_PORTAL_STATUS_UNKNOWN &&
          !HasDefaultNetworkProxyConfigured() &&
          network->connection_state() == shill::kStateOnline)) {
       return NetworkStateInformer::ONLINE;
     }
     if (status ==
-            NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED &&
+            captive_portal::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED &&
         HasDefaultNetworkProxyConfigured()) {
       return NetworkStateInformer::PROXY_AUTH_REQUIRED;
     }
-    if (status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL ||
-        (status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN &&
+    if (status == captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL ||
+        (status == captive_portal::CAPTIVE_PORTAL_STATUS_UNKNOWN &&
          network->connection_state() == shill::kStatePortal))
       return NetworkStateInformer::CAPTIVE_PORTAL;
   } else {