Index: chrome/browser/chromeos/login/wizard_controller_browsertest.cc |
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc |
index ef3276e819245b6f471040c7480650d4871b0dc6..4dbc0bdd3c726ae947f43fd43eeaf76bac44d813 100644 |
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc |
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc |
@@ -25,7 +25,6 @@ |
#include "chrome/browser/chromeos/login/screens/device_disabled_screen.h" |
#include "chrome/browser/chromeos/login/screens/error_screen.h" |
#include "chrome/browser/chromeos/login/screens/hid_detection_screen.h" |
-#include "chrome/browser/chromeos/login/screens/mock_device_disabled_screen_view.h" |
#include "chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.h" |
#include "chrome/browser/chromeos/login/screens/mock_eula_screen.h" |
#include "chrome/browser/chromeos/login/screens/mock_network_screen.h" |
@@ -445,12 +444,13 @@ class WizardControllerFlowTest : public WizardControllerTest { |
MOCK(mock_enable_debugging_screen_, |
OobeScreen::SCREEN_OOBE_ENABLE_DEBUGGING, MockEnableDebuggingScreen, |
MockCoreOobeView); |
- device_disabled_screen_view_.reset(new MockDeviceDisabledScreenView); |
+ core_oobe_view_.reset(new MockCoreOobeView); |
wizard_controller->screen_manager() |
->screens_[OobeScreen::SCREEN_DEVICE_DISABLED] = |
- base::MakeUnique<DeviceDisabledScreen>( |
- wizard_controller, device_disabled_screen_view_.get()); |
- EXPECT_CALL(*device_disabled_screen_view_, Show()).Times(0); |
+ base::MakeUnique<DeviceDisabledScreen>(wizard_controller, |
+ core_oobe_view_.get()); |
+ EXPECT_CALL(*core_oobe_view_, Show(DeviceDisabledScreen::kScreenId)) |
+ .Times(0); |
// Switch to the initial screen. |
EXPECT_EQ(NULL, wizard_controller->current_screen()); |
@@ -460,7 +460,7 @@ class WizardControllerFlowTest : public WizardControllerTest { |
void TearDownOnMainThread() override { |
mock_network_screen_ = nullptr; |
- device_disabled_screen_view_.reset(); |
+ core_oobe_view_.reset(); |
WizardControllerTest::TearDownOnMainThread(); |
} |
@@ -584,7 +584,7 @@ class WizardControllerFlowTest : public WizardControllerTest { |
mock_wrong_hwid_screen_; |
MockOutShowHide<MockEnableDebuggingScreen, MockCoreOobeView>* |
mock_enable_debugging_screen_; |
- std::unique_ptr<MockDeviceDisabledScreenView> device_disabled_screen_view_; |
+ std::unique_ptr<MockCoreOobeView> core_oobe_view_; |
private: |
NetworkPortalDetectorTestImpl* network_portal_detector_; |
@@ -975,9 +975,9 @@ IN_PROC_BROWSER_TEST_F(WizardControllerDeviceStateTest, |
device_state.SetString(policy::kDeviceStateDisabledMessage, kDisabledMessage); |
g_browser_process->local_state()->Set(prefs::kServerBackedDeviceState, |
device_state); |
- EXPECT_CALL(*device_disabled_screen_view_, UpdateMessage(kDisabledMessage)) |
+ EXPECT_CALL(*core_oobe_view_, UpdateDeviceDisabledMessage(kDisabledMessage)) |
.Times(1); |
- EXPECT_CALL(*device_disabled_screen_view_, Show()).Times(1); |
+ EXPECT_CALL(*core_oobe_view_, Show(DeviceDisabledScreen::kScreenId)).Times(1); |
OnExit(*mock_auto_enrollment_check_screen_, |
ScreenExitCode::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED); |