cros: WIP patch to remove DeviceDisabledScreenView.

chrome/browser/chromeos/login/wizard_controller_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 "chrome/browser/chromeos/login/wizard_controller.h"
 
 #include "ash/common/accessibility_types.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/base/locale_util.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
 #include "chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h"
 #include "chrome/browser/chromeos/login/enrollment/mock_enrollment_screen.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/oobe_screen.h"
 #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"
 #include "chrome/browser/chromeos/login/screens/mock_update_screen.h"
 #include "chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.h"
 #include "chrome/browser/chromeos/login/screens/network_screen.h"
 #include "chrome/browser/chromeos/login/screens/reset_screen.h"
 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
@@ skipping 399 matching lines @@
     MOCK(mock_enrollment_screen_, OobeScreen::SCREEN_OOBE_ENROLLMENT,
          MockEnrollmentScreen, MockEnrollmentScreenView);
     MOCK(mock_auto_enrollment_check_screen_,
          OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK,
          MockAutoEnrollmentCheckScreen, MockAutoEnrollmentCheckScreenView);
     MOCK(mock_wrong_hwid_screen_, OobeScreen::SCREEN_WRONG_HWID,
          MockWrongHWIDScreen, MockWrongHWIDScreenView);
     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());
     EXPECT_CALL(*mock_network_screen_, Show()).Times(1);
     wizard_controller->AdvanceToScreen(OobeScreen::SCREEN_OOBE_NETWORK);
   }
 
   void TearDownOnMainThread() override {
     mock_network_screen_ = nullptr;
-    device_disabled_screen_view_.reset();
+    core_oobe_view_.reset();
     WizardControllerTest::TearDownOnMainThread();
   }
 
   void TearDown() override {
     if (fallback_fetcher_factory_) {
       fetcher_factory_.reset();
       net::URLFetcherImpl::set_factory(fallback_fetcher_factory_.get());
       fallback_fetcher_factory_.reset();
     }
   }
@@ skipping 103 matching lines @@
   MockOutShowHide<MockEulaScreen, MockEulaView>* mock_eula_screen_;
   MockOutShowHide<MockEnrollmentScreen, MockEnrollmentScreenView>*
       mock_enrollment_screen_;
   MockOutShowHide<MockAutoEnrollmentCheckScreen,
                   MockAutoEnrollmentCheckScreenView>*
       mock_auto_enrollment_check_screen_;
   MockOutShowHide<MockWrongHWIDScreen, MockWrongHWIDScreenView>*
       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_;
 
   // Use a test factory as a fallback so we don't have to deal with other
   // requests.
   std::unique_ptr<WizardControllerTestURLFetcherFactory>
       fallback_fetcher_factory_;
   std::unique_ptr<net::FakeURLFetcherFactory> fetcher_factory_;
 
@@ skipping 370 matching lines @@
   // The error screen shows up if device state could not be retrieved.
   EXPECT_FALSE(StartupUtils::IsOobeCompleted());
   EXPECT_EQ(GetErrorScreen(),
             WizardController::default_controller()->current_screen());
   base::DictionaryValue device_state;
   device_state.SetString(policy::kDeviceStateRestoreMode,
                          policy::kDeviceStateRestoreModeDisabled);
   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);
 
   ResetAutoEnrollmentCheckScreen();
 
   // Make sure the device disabled screen is shown.
   CheckCurrentScreen(OobeScreen::SCREEN_DEVICE_DISABLED);
 
   EXPECT_FALSE(StartupUtils::IsOobeCompleted());
 }
@@ skipping 343 matching lines @@
 
 // TODO(dzhioev): Add tests for controller/host pairing flow.
 // http://crbug.com/375191
 
 // TODO(khmel): Add tests for ARC OptIn flow.
 // http://crbug.com/651144
 static_assert(static_cast<int>(ScreenExitCode::EXIT_CODES_COUNT) == 25,
               "tests for new control flow are missing");
 
 }  // namespace chromeos