Move CaptivePortalDetector to src/components/captive_portal

chrome/browser/ui/webui/chromeos/login/network_state_informer.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/ui/webui/chromeos/login/network_state_informer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 32 matching lines @@
 
 NetworkStateInformer::State GetStateForDefaultNetwork() {
   const NetworkState* network =
       NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
   if (!network)
     return NetworkStateInformer::OFFLINE;
 
   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 {
     if (NetworkState::StateIsConnecting(network->connection_state()))
       return NetworkStateInformer::CONNECTING;
     if (network->connection_state() == shill::kStateOnline)
       return NetworkStateInformer::ONLINE;
     if (network->connection_state() == shill::kStatePortal)
       return NetworkStateInformer::CAPTIVE_PORTAL;
   }
@@ skipping 118 matching lines @@
     SendStateToObservers(ErrorScreenActor::ERROR_REASON_UPDATE);
 }
 
 void NetworkStateInformer::SendStateToObservers(
     ErrorScreenActor::ErrorReason reason) {
   FOR_EACH_OBSERVER(NetworkStateInformerObserver, observers_,
       UpdateState(reason));
 }
 
 }  // namespace chromeos