Move CaptivePortalDetector to src/components/captive_portal

chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc

 // Copyright (c) 2013 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/managed/locally_managed_user_creation_screen.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "base/rand_util.h"
 #include "base/values.h"
@@ skipping 36 matching lines @@
 
 const char kUserNeedPassword[] = "needPassword";
 
 const char kAvatarURLKey[] = "avatarurl";
 const char kRandomAvatarKey[] = "randomAvatar";
 const char kNameOfIntroScreen[] = "intro";
 const char kNameOfNewUserParametersScreen[] = "username";
 
 void ConfigureErrorScreen(ErrorScreen* screen,
     const NetworkState* network,
-    const NetworkPortalDetector::CaptivePortalStatus status) {
+    const captive_portal::CaptivePortalStatus status) {
   switch (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:
       NOTREACHED();
       break;
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE:
+    case captive_portal::CAPTIVE_PORTAL_STATUS_OFFLINE:
       screen->SetErrorState(ErrorScreen::ERROR_STATE_OFFLINE,
                             std::string());
       break;
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL:
+    case captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL:
       screen->SetErrorState(ErrorScreen::ERROR_STATE_PORTAL,
                             network ? network->name() : std::string());
       screen->FixCaptivePortal();
       break;
-    case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:
+    case captive_portal::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:
       screen->SetErrorState(ErrorScreen::ERROR_STATE_PROXY,
                             std::string());
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 } // namespace
@@ skipping 45 matching lines @@
   on_error_screen_ = false;
 }
 
 void LocallyManagedUserCreationScreen::OnPageSelected(const std::string& page) {
   last_page_ = page;
 }
 
 void LocallyManagedUserCreationScreen::OnPortalDetectionCompleted(
     const NetworkState* network,
     const NetworkPortalDetector::CaptivePortalState& state)  {
-  if (state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE) {
+  if (state.status == captive_portal::CAPTIVE_PORTAL_STATUS_ONLINE) {
     get_screen_observer()->HideErrorScreen(this);
   } else {
     on_error_screen_ = true;
     ErrorScreen* screen = get_screen_observer()->GetErrorScreen();
     ConfigureErrorScreen(screen, network, state.status);
     screen->SetUIState(ErrorScreen::UI_STATE_LOCALLY_MANAGED);
     get_screen_observer()->ShowErrorScreen();
   }
 }
 
@@ skipping 433 matching lines @@
     selected_image_ = User::kExternalImageIndex;
   } else {
     NOTREACHED() << "Unexpected image type: " << image_type;
   }
 }
 
 void LocallyManagedUserCreationScreen::OnImageAccepted() {
 }
 
 }  // namespace chromeos