Move CaptivePortalDetector to src/components/captive_portal

chrome/browser/chromeos/login/screens/update_screen.cc

Index: chrome/browser/chromeos/login/screens/update_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/update_screen.cc b/chrome/browser/chromeos/login/screens/update_screen.cc
index 64a9a1dead5c5a17dfeb52d87170599d81c3894f..544ac6dcbd4b823e4512f16ae5cac53710143e6c 100644
--- a/chrome/browser/chromeos/login/screens/update_screen.cc
+++ b/chrome/browser/chromeos/login/screens/update_screen.cc
@@ -233,13 +233,13 @@ void UpdateScreen::OnPortalDetectionCompleted(
 
   // Wait for the sane detection results.
   if (network &&
-      state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN) {
+      state.status == captive_portal::CAPTIVE_PORTAL_STATUS_UNKNOWN) {
     return;
   }
 
   // Restart portal detection for the first notification about offline state.
   if ((!network ||
-       state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE) &&
+       state.status == captive_portal::CAPTIVE_PORTAL_STATUS_OFFLINE) &&
       is_first_detection_notification_) {
     is_first_detection_notification_ = false;
     base::MessageLoop::current()->PostTask(
@@ -251,18 +251,18 @@ void UpdateScreen::OnPortalDetectionCompleted(
   }
   is_first_detection_notification_ = false;
 
-  NetworkPortalDetector::CaptivePortalStatus status = state.status;
+  captive_portal::CaptivePortalStatus status = state.status;
   if (state_ == STATE_ERROR) {
     // In the case of online state hide error message and proceed to
     // the update stage. Otherwise, update error message content.
-    if (status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE)
+    if (status == captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE)
       StartUpdateCheck();
     else
       UpdateErrorMessage(network, status);
   } else if (state_ == STATE_FIRST_PORTAL_CHECK) {
     // In the case of online state immediately proceed to the update
     // stage. Otherwise, prepare and show error message.
-    if (status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE) {
+    if (status == captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE) {
       StartUpdateCheck();
     } else {
       UpdateErrorMessage(network, status);
@@ -491,17 +491,17 @@ void UpdateScreen::HideErrorMessage() {
 
 void UpdateScreen::UpdateErrorMessage(
     const NetworkState* network,
-    const NetworkPortalDetector::CaptivePortalStatus status) {
+    const captive_portal::CaptivePortalStatus status) {
   switch (status) {
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE:
+    case captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE:
       NOTREACHED();
       break;
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN:
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE:
+    case captive_portal::CAPTIVE_PORTAL_STATUS_UNKNOWN:
+    case captive_portal::CAPTIVE_PORTAL_STATUS_OFFLINE:
       GetErrorScreen()->SetErrorState(ErrorScreen::ERROR_STATE_OFFLINE,
                                       std::string());
       break;
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL:
+    case captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL:
       DCHECK(network);
       GetErrorScreen()->SetErrorState(ErrorScreen::ERROR_STATE_PORTAL,
                                       network->name());
@@ -510,7 +510,7 @@ void UpdateScreen::UpdateErrorMessage(
         GetErrorScreen()->FixCaptivePortal();
       }
       break;
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:
+    case captive_portal::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:
       GetErrorScreen()->SetErrorState(ErrorScreen::ERROR_STATE_PROXY,
                                       std::string());
       break;