Move CaptivePortalDetector to src/components/captive_portal

chrome/browser/chromeos/login/screens/update_screen.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/chromeos/login/screens/update_screen.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 215 matching lines @@
 void UpdateScreen::OnPortalDetectionCompleted(
     const NetworkState* network,
     const NetworkPortalDetector::CaptivePortalState& state) {
   LOG(WARNING) << "UpdateScreen::PortalDetectionCompleted(): "
                << "network=" << (network ? network->path() : "") << ", "
                << "state.status=" << state.status << ", "
                << "state.response_code=" << state.response_code;
 
   // 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(
         FROM_HERE,
         base::Bind(
             base::IgnoreResult(&NetworkPortalDetector::StartDetectionIfIdle),
             base::Unretained(NetworkPortalDetector::Get())));
     return;
   }
   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);
       ShowErrorMessage();
     }
   }
 }
 
 void UpdateScreen::StartNetworkCheck() {
   // If portal detector is enabled and portal detection before AU is
@@ skipping 208 matching lines @@
   get_screen_observer()->ShowErrorScreen();
 }
 
 void UpdateScreen::HideErrorMessage() {
   LOG(WARNING) << "UpdateScreen::HideErrorMessage()";
   get_screen_observer()->HideErrorScreen(this);
 }
 
 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());
       if (is_first_portal_notification_) {
         is_first_portal_notification_ = false;
         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;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace chromeos