Move CaptivePortalDetector to src/components/captive_portal

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

Index: chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
index fe2115a88e46b5a540066f779056f15cf3601a91..ab524738f13c84f12f9f1db3ebb587e041603ffc 100644
--- a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
@@ -58,7 +58,7 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
     network_portal_detector_ = new NetworkPortalDetectorTestImpl();
     NetworkPortalDetector::InitializeForTesting(network_portal_detector_);
     NetworkPortalDetector::CaptivePortalState online_state;
-    online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
+    online_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE;
     online_state.response_code = 204;
     SetDefaultNetworkPath(kStubEthernetServicePath);
     SetDetectionResults(kStubEthernetServicePath, online_state);
@@ -236,7 +236,7 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestTemproraryOfflineNetwork) {
 
   // Change ethernet state to portal.
   NetworkPortalDetector::CaptivePortalState portal_state;
-  portal_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;
+  portal_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL;
   portal_state.response_code = 200;
   SetDetectionResults(kStubEthernetServicePath, portal_state);
 
@@ -256,7 +256,7 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestTemproraryOfflineNetwork) {
   update_screen_->StartNetworkCheck();
 
   NetworkPortalDetector::CaptivePortalState online_state;
-  online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
+  online_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE;
   online_state.response_code = 204;
   SetDetectionResults(kStubEthernetServicePath, online_state);
 
@@ -282,7 +282,7 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestTwoOfflineNetworks) {
 
   // Change ethernet state to portal.
   NetworkPortalDetector::CaptivePortalState portal_state;
-  portal_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;
+  portal_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL;
   portal_state.response_code = 200;
   SetDetectionResults(kStubEthernetServicePath, portal_state);
 
@@ -304,7 +304,7 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestTwoOfflineNetworks) {
   // Change active network to the wifi behind proxy.
   NetworkPortalDetector::CaptivePortalState proxy_state;
   proxy_state.status =
-      NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED;
+      captive_portal::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED;
   proxy_state.response_code = -1;
   SetDefaultNetworkPath(kStubWifiServicePath);
   SetDetectionResults(kStubWifiServicePath, proxy_state);
@@ -361,7 +361,7 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestAPReselection) {
 
   // Change ethernet state to portal.
   NetworkPortalDetector::CaptivePortalState portal_state;
-  portal_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;
+  portal_state.status = captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL;
   portal_state.response_code = 200;
   SetDetectionResults(kStubEthernetServicePath, portal_state);