cros: Unify oobe View/Actor naming to just View.

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_actor.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 154 matching lines @@
 }
 
 }  // namespace
 
 using ::testing::_;
 
 template <class T, class H>
 class MockOutShowHide : public T {
  public:
   template <class P> explicit  MockOutShowHide(P p) : T(p) {}
-  template <class P> MockOutShowHide(P p, H* actor)
-      : T(p, actor), actor_(actor) {}
+  template <class P>
+  MockOutShowHide(P p, H* view) : T(p, view), view_(view) {}
   template <class P, class Q>
-  MockOutShowHide(P p, Q q, H* actor)
-      : T(p, q, actor), actor_(actor) {}
+  MockOutShowHide(P p, Q q, H* view) : T(p, q, view), view_(view) {}
 
-  H* actor() const { return actor_.get(); }
+  H* view() const { return view_.get(); }
 
   MOCK_METHOD0(Show, void());
   MOCK_METHOD0(Hide, void());
 
   void RealShow() {
     T::Show();
   }
 
   void RealHide() {
     T::Hide();
   }
 
  private:
-  std::unique_ptr<H> actor_;
+  std::unique_ptr<H> view_;
 };
 
-#define MOCK(mock_var, screen_name, mocked_class, actor_class)    \
-  mock_var = new MockOutShowHide<mocked_class, actor_class>(      \
-      WizardController::default_controller(), new actor_class);   \
+#define MOCK(mock_var, screen_name, mocked_class, view_class)     \
+  mock_var = new MockOutShowHide<mocked_class, view_class>(       \
+      WizardController::default_controller(), new view_class);    \
   WizardController::default_controller()->screens_[screen_name] = \
       make_linked_ptr(mock_var);                                  \
   EXPECT_CALL(*mock_var, Show()).Times(0);                        \
   EXPECT_CALL(*mock_var, Hide()).Times(0);
 
-#define MOCK_WITH_DELEGATE(mock_var, screen_name, mocked_class, actor_class) \
-  mock_var = new MockOutShowHide<mocked_class, actor_class>(                 \
-      WizardController::default_controller(),                                \
-      WizardController::default_controller(), new actor_class);              \
-  WizardController::default_controller()->screens_[screen_name] =            \
-      make_linked_ptr(mock_var);                                             \
-  EXPECT_CALL(*mock_var, Show()).Times(0);                                   \
+#define MOCK_WITH_DELEGATE(mock_var, screen_name, mocked_class, view_class) \
+  mock_var = new MockOutShowHide<mocked_class, view_class>(                 \
+      WizardController::default_controller(),                               \
+      WizardController::default_controller(), new view_class);              \
+  WizardController::default_controller()->screens_[screen_name] =           \
+      make_linked_ptr(mock_var);                                            \
+  EXPECT_CALL(*mock_var, Show()).Times(0);                                  \
   EXPECT_CALL(*mock_var, Hide()).Times(0);
 
 class WizardControllerTest : public WizardInProcessBrowserTest {
  protected:
   WizardControllerTest()
       : WizardInProcessBrowserTest(OobeScreen::SCREEN_TEST_NO_WINDOW) {}
   ~WizardControllerTest() override {}
 
   void SetUpOnMainThread() override {
     AccessibilityManager::Get()->
@@ skipping 175 matching lines @@
     WizardController::default_controller()
         ->screens_[OobeScreen::SCREEN_OOBE_NETWORK] = mock_network_screen_;
     EXPECT_CALL(*mock_network_screen_, Show()).Times(0);
     EXPECT_CALL(*mock_network_screen_, Hide()).Times(0);
 
     MOCK(mock_update_screen_, OobeScreen::SCREEN_OOBE_UPDATE, MockUpdateScreen,
          MockUpdateView);
     MOCK_WITH_DELEGATE(mock_eula_screen_, OobeScreen::SCREEN_OOBE_EULA,
                        MockEulaScreen, MockEulaView);
     MOCK(mock_enrollment_screen_, OobeScreen::SCREEN_OOBE_ENROLLMENT,
-         MockEnrollmentScreen, MockEnrollmentScreenActor);
+         MockEnrollmentScreen, MockEnrollmentScreenView);
     MOCK(mock_auto_enrollment_check_screen_,
          OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK,
-         MockAutoEnrollmentCheckScreen, MockAutoEnrollmentCheckScreenActor);
+         MockAutoEnrollmentCheckScreen, MockAutoEnrollmentCheckScreenView);
     MOCK(mock_wrong_hwid_screen_, OobeScreen::SCREEN_WRONG_HWID,
-         MockWrongHWIDScreen, MockWrongHWIDScreenActor);
+         MockWrongHWIDScreen, MockWrongHWIDScreenView);
     MOCK(mock_enable_debugging_screen_,
          OobeScreen::SCREEN_OOBE_ENABLE_DEBUGGING, MockEnableDebuggingScreen,
-         MockEnableDebuggingScreenActor);
-    device_disabled_screen_actor_.reset(new MockDeviceDisabledScreenActor);
+         MockEnableDebuggingScreenView);
+    device_disabled_screen_view_.reset(new MockDeviceDisabledScreenView);
     wizard_controller->screens_[OobeScreen::SCREEN_DEVICE_DISABLED] =
         make_linked_ptr(new DeviceDisabledScreen(
-            wizard_controller, device_disabled_screen_actor_.get()));
-    EXPECT_CALL(*device_disabled_screen_actor_, Show()).Times(0);
+            wizard_controller, device_disabled_screen_view_.get()));
+    EXPECT_CALL(*device_disabled_screen_view_, Show()).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_.reset();
-    device_disabled_screen_actor_.reset();
+    device_disabled_screen_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 43 matching lines @@
   }
 
   void ResetAutoEnrollmentCheckScreen() {
     WizardController::default_controller()->screens_.erase(
         OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK);
   }
 
   linked_ptr<MockNetworkScreen> mock_network_screen_;
   MockOutShowHide<MockUpdateScreen, MockUpdateView>* mock_update_screen_;
   MockOutShowHide<MockEulaScreen, MockEulaView>* mock_eula_screen_;
-  MockOutShowHide<MockEnrollmentScreen,
-      MockEnrollmentScreenActor>* mock_enrollment_screen_;
+  MockOutShowHide<MockEnrollmentScreen, MockEnrollmentScreenView>*
+      mock_enrollment_screen_;
   MockOutShowHide<MockAutoEnrollmentCheckScreen,
-      MockAutoEnrollmentCheckScreenActor>* mock_auto_enrollment_check_screen_;
-  MockOutShowHide<MockWrongHWIDScreen, MockWrongHWIDScreenActor>*
+                  MockAutoEnrollmentCheckScreenView>*
+      mock_auto_enrollment_check_screen_;
+  MockOutShowHide<MockWrongHWIDScreen, MockWrongHWIDScreenView>*
       mock_wrong_hwid_screen_;
-  MockOutShowHide<MockEnableDebuggingScreen,
-      MockEnableDebuggingScreenActor>* mock_enable_debugging_screen_;
-  std::unique_ptr<MockDeviceDisabledScreenActor> device_disabled_screen_actor_;
+  MockOutShowHide<MockEnableDebuggingScreen, MockEnableDebuggingScreenView>*
+      mock_enable_debugging_screen_;
+  std::unique_ptr<MockDeviceDisabledScreenView> device_disabled_screen_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 123 matching lines @@
   EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
   EXPECT_CALL(*mock_update_screen_, Show()).Times(0);
   EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
   OnExit(*mock_network_screen_, BaseScreenDelegate::NETWORK_CONNECTED);
 
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_EULA);
   EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
   EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(0);
   EXPECT_CALL(*mock_update_screen_, Show()).Times(0);
   WizardController::default_controller()->SkipUpdateEnrollAfterEula();
-  EXPECT_CALL(*mock_enrollment_screen_->actor(),
+  EXPECT_CALL(*mock_enrollment_screen_->view(),
               SetParameters(
                   mock_enrollment_screen_,
                   EnrollmentModeMatches(policy::EnrollmentConfig::MODE_MANUAL)))
       .Times(1);
   EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
   OnExit(*mock_eula_screen_, BaseScreenDelegate::EULA_ACCEPTED);
   content::RunAllPendingInMessageLoop();
 
   CheckCurrentScreen(OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK);
   EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
@@ skipping 22 matching lines @@
   EXPECT_CALL(*mock_network_screen_, Hide()).Times(0);  // last transition
   OnExit(*mock_eula_screen_, BaseScreenDelegate::EULA_BACK);
 
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_NETWORK);
 }
 
 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
                        ControlFlowEnrollmentCompleted) {
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_NETWORK);
   EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(0);
-  EXPECT_CALL(*mock_enrollment_screen_->actor(),
+  EXPECT_CALL(*mock_enrollment_screen_->view(),
               SetParameters(
                   mock_enrollment_screen_,
                   EnrollmentModeMatches(policy::EnrollmentConfig::MODE_MANUAL)))
       .Times(1);
   EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1);
   EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
 
   WizardController::default_controller()->AdvanceToScreen(
       OobeScreen::SCREEN_OOBE_ENROLLMENT);
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_ENROLLMENT);
@@ skipping 141 matching lines @@
   // The error screen shows up if there's no auto-enrollment decision.
   EXPECT_FALSE(StartupUtils::IsOobeCompleted());
   EXPECT_EQ(GetErrorScreen(),
             WizardController::default_controller()->current_screen());
   base::DictionaryValue device_state;
   device_state.SetString(policy::kDeviceStateRestoreMode,
                          policy::kDeviceStateRestoreModeReEnrollmentEnforced);
   g_browser_process->local_state()->Set(prefs::kServerBackedDeviceState,
                                         device_state);
   EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1);
-  EXPECT_CALL(*mock_enrollment_screen_->actor(),
+  EXPECT_CALL(*mock_enrollment_screen_->view(),
               SetParameters(mock_enrollment_screen_,
                             EnrollmentModeMatches(
                                 policy::EnrollmentConfig::MODE_SERVER_FORCED)))
       .Times(1);
   OnExit(*mock_auto_enrollment_check_screen_,
          BaseScreenDelegate::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
 
   ResetAutoEnrollmentCheckScreen();
 
   // Make sure enterprise enrollment page shows up.
@@ skipping 68 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_actor_,
-              UpdateMessage(kDisabledMessage)).Times(1);
-  EXPECT_CALL(*device_disabled_screen_actor_, Show()).Times(1);
+  EXPECT_CALL(*device_disabled_screen_view_, UpdateMessage(kDisabledMessage))
+      .Times(1);
+  EXPECT_CALL(*device_disabled_screen_view_, Show()).Times(1);
   OnExit(*mock_auto_enrollment_check_screen_,
          BaseScreenDelegate::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
 
   ResetAutoEnrollmentCheckScreen();
 
   // Make sure the device disabled screen is shown.
   CheckCurrentScreen(OobeScreen::SCREEN_DEVICE_DISABLED);
 
   EXPECT_FALSE(StartupUtils::IsOobeCompleted());
 }
@@ skipping 123 matching lines @@
         switches::kAppOemManifestFile,
         test_data_dir.AppendASCII("kiosk_manifest.json"));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WizardControllerKioskFlowTest);
 };
 
 IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
                        ControlFlowKioskForcedEnrollment) {
-  EXPECT_CALL(*mock_enrollment_screen_->actor(),
+  EXPECT_CALL(*mock_enrollment_screen_->view(),
               SetParameters(mock_enrollment_screen_,
                             EnrollmentModeMatches(
                                 policy::EnrollmentConfig::MODE_LOCAL_FORCED)))
       .Times(1);
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_NETWORK);
   EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
   EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
   OnExit(*mock_network_screen_, BaseScreenDelegate::NETWORK_CONNECTED);
 
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_EULA);
@@ skipping 21 matching lines @@
   // Make sure enterprise enrollment page shows up right after update screen.
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_ENROLLMENT);
   OnExit(*mock_enrollment_screen_,
          BaseScreenDelegate::ENTERPRISE_ENROLLMENT_COMPLETED);
 
   EXPECT_TRUE(StartupUtils::IsOobeCompleted());
 }
 
 IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
                        ControlFlowEnrollmentBack) {
-  EXPECT_CALL(*mock_enrollment_screen_->actor(),
+  EXPECT_CALL(*mock_enrollment_screen_->view(),
               SetParameters(mock_enrollment_screen_,
                             EnrollmentModeMatches(
                                 policy::EnrollmentConfig::MODE_LOCAL_FORCED)))
       .Times(1);
 
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_NETWORK);
   EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
   EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
   OnExit(*mock_network_screen_, BaseScreenDelegate::NETWORK_CONNECTED);
 
@@ skipping 81 matching lines @@
     // Make sure that OOBE is run as an "official" build.
     WizardController::default_controller()->is_official_build_ = true;
 
     // Clear portal list (as it is by default in OOBE).
     NetworkHandler::Get()->network_state_handler()->SetCheckPortalList("");
 
     // Set up the mocks for all screens.
     MOCK_WITH_DELEGATE(mock_network_screen_, OobeScreen::SCREEN_OOBE_NETWORK,
                        MockNetworkScreen, MockNetworkView);
     MOCK(mock_enrollment_screen_, OobeScreen::SCREEN_OOBE_ENROLLMENT,
-         MockEnrollmentScreen, MockEnrollmentScreenActor);
+         MockEnrollmentScreen, MockEnrollmentScreenView);
   }
 
   void OnExit(BaseScreen& screen, BaseScreenDelegate::ExitCodes exit_code) {
     WizardController::default_controller()->OnExit(screen, exit_code,
                                                    nullptr /* context */);
   }
 
   OobeScreen GetFirstScreen() {
     return WizardController::default_controller()->first_screen();
   }
 
   MockOutShowHide<MockNetworkScreen, MockNetworkView>* mock_network_screen_;
-  MockOutShowHide<MockEnrollmentScreen,
-      MockEnrollmentScreenActor>* mock_enrollment_screen_;
+  MockOutShowHide<MockEnrollmentScreen, MockEnrollmentScreenView>*
+      mock_enrollment_screen_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WizardControllerOobeResumeTest);
 };
 
 IN_PROC_BROWSER_TEST_F(WizardControllerOobeResumeTest,
                        PRE_ControlFlowResumeInterruptedOobe) {
   // Switch to the initial screen.
   EXPECT_CALL(*mock_network_screen_, Show()).Times(1);
   WizardController::default_controller()->AdvanceToScreen(
       OobeScreen::SCREEN_OOBE_NETWORK);
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_NETWORK);
-  EXPECT_CALL(*mock_enrollment_screen_->actor(),
+  EXPECT_CALL(*mock_enrollment_screen_->view(),
               SetParameters(
                   mock_enrollment_screen_,
                   EnrollmentModeMatches(policy::EnrollmentConfig::MODE_MANUAL)))
       .Times(1);
   EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1);
   EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
 
   WizardController::default_controller()->AdvanceToScreen(
       OobeScreen::SCREEN_OOBE_ENROLLMENT);
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_ENROLLMENT);
@@ skipping 13 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(BaseScreenDelegate::EXIT_CODES_COUNT == 25,
               "tests for new control flow are missing");
 
 }  // namespace chromeos