Move CaptivePortalDetector to src/components/captive_portal

chrome/browser/chromeos/login/screens/update_screen_browsertest.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 "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h"
 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"
 #include "chrome/browser/chromeos/login/screens/update_screen.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ skipping 40 matching lines @@
 
     DBusThreadManager::SetInstanceForTesting(fake_dbus_thread_manager);
     WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
 
     // Setup network portal detector to return online state for both
     // ethernet and wifi networks. Ethernet is an active network by
     // default.
     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);
     SetDetectionResults(kStubWifiServicePath, online_state);
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     WizardInProcessBrowserTest::SetUpOnMainThread();
 
     mock_screen_observer_.reset(new MockScreenObserver());
@@ skipping 157 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestTemproraryOfflineNetwork) {
   EXPECT_CALL(*mock_screen_observer_,
               OnExit(ScreenObserver::UPDATE_NOUPDATE))
       .Times(1);
   update_screen_->CancelUpdate();
 
   // 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);
 
   // Update screen will show error message about portal state because
   // ethernet is behind captive portal.
   EXPECT_CALL(*mock_error_screen_actor_,
               SetUIState(ErrorScreen::UI_STATE_UPDATE))
       .Times(1);
   EXPECT_CALL(*mock_error_screen_actor_,
               SetErrorState(ErrorScreen::ERROR_STATE_PORTAL, std::string()))
       .Times(1);
   EXPECT_CALL(*mock_error_screen_actor_, FixCaptivePortal())
       .Times(1);
   EXPECT_CALL(*mock_screen_observer_, ShowErrorScreen())
       .Times(1);
 
   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);
 
   // Second notification from portal detector will be about online state,
   // so update screen will hide error message and proceed to update.
   EXPECT_CALL(*mock_screen_observer_, HideErrorScreen(update_screen_))
       .Times(1);
   fake_update_engine_client_->set_update_check_result(
       chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);
 
   EXPECT_CALL(*mock_screen_observer_,
               OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE))
       .Times(1);
 
   NotifyPortalDetectionCompleted();
 }
 
 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestTwoOfflineNetworks) {
   EXPECT_CALL(*mock_screen_observer_,
               OnExit(ScreenObserver::UPDATE_NOUPDATE))
       .Times(1);
   update_screen_->CancelUpdate();
 
   // 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);
 
   // Update screen will show error message about portal state because
   // ethernet is behind captive portal.
   EXPECT_CALL(*mock_error_screen_actor_,
               SetUIState(ErrorScreen::UI_STATE_UPDATE))
       .Times(1);
   EXPECT_CALL(*mock_error_screen_actor_,
               SetErrorState(ErrorScreen::ERROR_STATE_PORTAL, std::string()))
       .Times(1);
   EXPECT_CALL(*mock_error_screen_actor_, FixCaptivePortal())
       .Times(1);
   EXPECT_CALL(*mock_screen_observer_, ShowErrorScreen())
       .Times(1);
 
   update_screen_->StartNetworkCheck();
 
   // 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);
 
   // Update screen will show message about proxy error because wifie
   // network requires proxy authentication.
   EXPECT_CALL(*mock_error_screen_actor_,
               SetErrorState(ErrorScreen::ERROR_STATE_PROXY, std::string()))
       .Times(1);
 
@@ skipping 36 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestAPReselection) {
   EXPECT_CALL(*mock_screen_observer_,
               OnExit(ScreenObserver::UPDATE_NOUPDATE))
       .Times(1);
   update_screen_->CancelUpdate();
 
   // 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);
 
   // Update screen will show error message about portal state because
   // ethernet is behind captive portal.
   EXPECT_CALL(*mock_error_screen_actor_,
               SetUIState(ErrorScreen::UI_STATE_UPDATE))
       .Times(1);
   EXPECT_CALL(*mock_error_screen_actor_,
               SetErrorState(ErrorScreen::ERROR_STATE_PORTAL, std::string()))
@@ skipping 14 matching lines @@
       chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);
   EXPECT_CALL(*mock_screen_observer_,
               OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE))
       .Times(1);
 
   update_screen_->OnConnectToNetworkRequested(kStubEthernetServicePath);
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace chromeos