Move CaptivePortalDetector to src/components/captive_portal

chrome/browser/chromeos/login/enrollment/auto_enrollment_check_step.cc

Index: chrome/browser/chromeos/login/enrollment/auto_enrollment_check_step.cc
diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_step.cc b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_step.cc
index 276e4053a420150a888ccbf50cc6ab49d778f6e9..3747b31b350dbf2b2c68806e0e586bfd78215ac5 100644
--- a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_step.cc
+++ b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_step.cc
@@ -21,7 +21,7 @@ AutoEnrollmentCheckStep::AutoEnrollmentCheckStep(
     : screen_observer_(screen_observer),
       auto_enrollment_controller_(auto_enrollment_controller),
       captive_portal_status_(
-          NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN),
+          captive_portal::CAPTIVE_PORTAL_STATUS_UNKNOWN),
       auto_enrollment_state_(policy::AUTO_ENROLLMENT_STATE_IDLE) {}
 
 AutoEnrollmentCheckStep::~AutoEnrollmentCheckStep() {
@@ -63,7 +63,7 @@ void AutoEnrollmentCheckStep::OnAutoEnrollmentCheckProgressed(
 }
 
 void AutoEnrollmentCheckStep::UpdateState(
-    NetworkPortalDetector::CaptivePortalStatus new_captive_portal_status,
+    captive_portal::CaptivePortalStatus new_captive_portal_status,
     policy::AutoEnrollmentState new_auto_enrollment_state) {
   // Configure the error screen to show the approriate error message.
   if (!UpdateCaptivePortalStatus(new_captive_portal_status))
@@ -76,9 +76,9 @@ void AutoEnrollmentCheckStep::UpdateState(
 
   // Determine whether a retry is in order.
   bool retry = (new_captive_portal_status ==
-                NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE) &&
+                captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE) &&
                (captive_portal_status_ !=
-                NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE);
+                captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE);
 
   // Save the new state.
   captive_portal_status_ = new_captive_portal_status;
@@ -108,23 +108,23 @@ void AutoEnrollmentCheckStep::UpdateState(
 }
 
 bool AutoEnrollmentCheckStep::UpdateCaptivePortalStatus(
-    NetworkPortalDetector::CaptivePortalStatus new_captive_portal_status) {
+    captive_portal::CaptivePortalStatus new_captive_portal_status) {
   switch (new_captive_portal_status) {
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN:
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE:
+    case captive_portal::CAPTIVE_PORTAL_STATUS_UNKNOWN:
+    case captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE:
       return false;
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE:
+    case captive_portal::CAPTIVE_PORTAL_STATUS_OFFLINE:
       ShowErrorScreen(ErrorScreen::ERROR_STATE_OFFLINE);
       return true;
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL:
+    case captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL:
       ShowErrorScreen(ErrorScreen::ERROR_STATE_PORTAL);
       if (captive_portal_status_ != new_captive_portal_status)
         screen_observer_->GetErrorScreen()->FixCaptivePortal();
       return true;
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:
+    case captive_portal::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:
       ShowErrorScreen(ErrorScreen::ERROR_STATE_PROXY);
       return true;
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT:
+    case captive_portal::CAPTIVE_PORTAL_STATUS_COUNT:
       // Trigger NOTREACHED() below.
       break;
   }