cros: Simplify how views/screens are mocked in WizardControllerBrowsertest

This eliminates MockOutShowHide and simplifies lifetime.

MockOutShowHide derived from another Mock class, and also embedded the
view inside of it. This means that the view was destroyed while the
model was being destroyed.

EXPECT_* methods are now moved to test code instead of the mock class,
since the EXPECT_* methods assume a specific type of usage that is not
always present.

ScreenManager is also cleaned up so that it does not declare any friend
tests.

Bug: 928555
Change-Id: I2f61648dc980e4d5b08620d76d3bbd4d58cd2403
Reviewed-on: https://chromium-review.googlesource.com/c/1450281Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: Denis Kuznetsov <antrim@chromium.org>
Commit-Queue: Jacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/heads/master@{#629264}

chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.cc

@@ -4,9 +4,6 @@
 
 #include "chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h"
 
-using ::testing::AtLeast;
-using ::testing::NotNull;
-
 namespace chromeos {
 
 MockAutoEnrollmentCheckScreen::MockAutoEnrollmentCheckScreen(
@@ -16,11 +13,13 @@ MockAutoEnrollmentCheckScreen::MockAutoEnrollmentCheckScreen(
 
 MockAutoEnrollmentCheckScreen::~MockAutoEnrollmentCheckScreen() {}
 
-MockAutoEnrollmentCheckScreenView::MockAutoEnrollmentCheckScreenView()
-    : screen_(NULL) {
-  EXPECT_CALL(*this, MockSetDelegate(NotNull())).Times(AtLeast(1));
+void MockAutoEnrollmentCheckScreen::RealShow() {
+  AutoEnrollmentCheckScreen::Show();
 }
 
+MockAutoEnrollmentCheckScreenView::MockAutoEnrollmentCheckScreenView() =
+    default;
+
 MockAutoEnrollmentCheckScreenView::~MockAutoEnrollmentCheckScreenView() {
   if (screen_)
     screen_->OnViewDestroyed(this);

chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h

@@ -16,6 +16,11 @@ class MockAutoEnrollmentCheckScreen : public AutoEnrollmentCheckScreen {
   MockAutoEnrollmentCheckScreen(BaseScreenDelegate* base_screen_delegate,
                                 AutoEnrollmentCheckScreenView* view);
   ~MockAutoEnrollmentCheckScreen() override;
+
+  MOCK_METHOD0(Show, void());
+  MOCK_METHOD0(Hide, void());
+
+  void RealShow();
 };
 
 class MockAutoEnrollmentCheckScreenView : public AutoEnrollmentCheckScreenView {
@@ -29,7 +34,7 @@ class MockAutoEnrollmentCheckScreenView : public AutoEnrollmentCheckScreenView {
   MOCK_METHOD0(Show, void());
 
  private:
-  Delegate* screen_;
+  Delegate* screen_ = nullptr;
 };
 
 }  // namespace chromeos

chrome/browser/chromeos/login/enrollment/mock_enrollment_screen.h

@@ -19,6 +19,9 @@ class MockEnrollmentScreen : public EnrollmentScreen {
   MockEnrollmentScreen(BaseScreenDelegate* base_screen_delegate,
                        EnrollmentScreenView* view);
   ~MockEnrollmentScreen() override;
+
+  MOCK_METHOD0(Show, void());
+  MOCK_METHOD0(Hide, void());
 };
 
 class MockEnrollmentScreenView : public EnrollmentScreenView {

chrome/browser/chromeos/login/screen_manager.cc

@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/login/screen_manager.h"
 
+#include <utility>
+
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 
@@ -30,4 +32,15 @@ bool ScreenManager::HasScreen(OobeScreen screen) {
   return screens_.count(screen) > 0;
 }
 
+void ScreenManager::SetScreenForTesting(std::unique_ptr<BaseScreen> value) {
+  // Capture screen id to avoid using `value` after moving it; = is not a
+  // sequence point.
+  auto id = value->screen_id();
+  screens_[id] = std::move(value);
+}
+
+void ScreenManager::DeleteScreenForTesting(OobeScreen screen) {
+  screens_[screen] = nullptr;
+}
+
 }  // namespace chromeos

chrome/browser/chromeos/login/screen_manager.h

@@ -26,15 +26,10 @@ class ScreenManager {
 
   bool HasScreen(OobeScreen screen);
 
- private:
-  FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenTest, TestCancel);
-  FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, Accelerators);
-  friend class WizardControllerFlowTest;
-  friend class WizardControllerOobeResumeTest;
-  friend class WizardControllerBrokenLocalStateTest;
-  friend class WizardControllerOobeConfigurationTest;
-  friend class WizardControllerSupervisionTransitionOobeTest;
+  void SetScreenForTesting(std::unique_ptr<BaseScreen> value);
+  void DeleteScreenForTesting(OobeScreen screen);
 
+ private:
   // Created screens.
   std::map<OobeScreen, std::unique_ptr<BaseScreen>> screens_;
 

chrome/browser/chromeos/login/screens/mock_arc_terms_of_service_screen.cc

@@ -4,9 +4,6 @@
 
 #include "chrome/browser/chromeos/login/screens/mock_arc_terms_of_service_screen.h"
 
-using ::testing::AtLeast;
-using ::testing::NotNull;
-
 namespace chromeos {
 
 MockArcTermsOfServiceScreen::MockArcTermsOfServiceScreen(
@@ -29,4 +26,11 @@ void MockArcTermsOfServiceScreenView::AddObserver(
   MockAddObserver(observer);
 }
 
+void MockArcTermsOfServiceScreenView::RemoveObserver(
+    ArcTermsOfServiceScreenViewObserver* observer) {
+  if (observer_ == observer)
+    observer_ = nullptr;
+  MockRemoveObserver(observer);
+}
+
 }  // namespace chromeos

chrome/browser/chromeos/login/screens/mock_arc_terms_of_service_screen.h

@@ -16,6 +16,9 @@ class MockArcTermsOfServiceScreen : public ArcTermsOfServiceScreen {
   MockArcTermsOfServiceScreen(BaseScreenDelegate* base_screen_delegate,
                               ArcTermsOfServiceScreenView* view);
   ~MockArcTermsOfServiceScreen() override;
+
+  MOCK_METHOD0(Show, void());
+  MOCK_METHOD0(Hide, void());
 };
 
 class MockArcTermsOfServiceScreenView : public ArcTermsOfServiceScreenView {
@@ -24,17 +27,18 @@ class MockArcTermsOfServiceScreenView : public ArcTermsOfServiceScreenView {
   ~MockArcTermsOfServiceScreenView() override;
 
   void AddObserver(ArcTermsOfServiceScreenViewObserver* observer) override;
+  void RemoveObserver(ArcTermsOfServiceScreenViewObserver* observer) override;
 
   MOCK_METHOD0(Show, void());
   MOCK_METHOD0(Hide, void());
   MOCK_METHOD1(Bind, void(ArcTermsOfServiceScreen* screen));
   MOCK_METHOD1(MockAddObserver,
                void(ArcTermsOfServiceScreenViewObserver* observer));
-  MOCK_METHOD1(RemoveObserver,
+  MOCK_METHOD1(MockRemoveObserver,
                void(ArcTermsOfServiceScreenViewObserver* observer));
 
  private:
-  ArcTermsOfServiceScreenViewObserver* observer_;
+  ArcTermsOfServiceScreenViewObserver* observer_ = nullptr;
 };
 
 }  // namespace chromeos

chrome/browser/chromeos/login/screens/mock_demo_preferences_screen.cc

@@ -4,9 +4,6 @@
 
 #include "chrome/browser/chromeos/login/screens/mock_demo_preferences_screen.h"
 
-using ::testing::AtLeast;
-using ::testing::NotNull;
-
 namespace chromeos {
 
 MockDemoPreferencesScreen::MockDemoPreferencesScreen(
@@ -16,9 +13,7 @@ MockDemoPreferencesScreen::MockDemoPreferencesScreen(
 
 MockDemoPreferencesScreen::~MockDemoPreferencesScreen() = default;
 
-MockDemoPreferencesScreenView::MockDemoPreferencesScreenView() {
-  EXPECT_CALL(*this, MockBind(NotNull())).Times(AtLeast(1));
-}
+MockDemoPreferencesScreenView::MockDemoPreferencesScreenView() = default;
 
 MockDemoPreferencesScreenView::~MockDemoPreferencesScreenView() {
   if (screen_)

chrome/browser/chromeos/login/screens/mock_demo_preferences_screen.h

@@ -18,6 +18,9 @@ class MockDemoPreferencesScreen : public DemoPreferencesScreen {
                             DemoPreferencesScreenView* view);
   ~MockDemoPreferencesScreen() override;
 
+  MOCK_METHOD0(Show, void());
+  MOCK_METHOD0(Hide, void());
+
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDemoPreferencesScreen);
 };
@@ -34,7 +37,7 @@ class MockDemoPreferencesScreenView : public DemoPreferencesScreenView {
   void Bind(DemoPreferencesScreen* screen) override;
 
  private:
-  DemoPreferencesScreen* screen_;
+  DemoPreferencesScreen* screen_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(MockDemoPreferencesScreenView);
 };

chrome/browser/chromeos/login/screens/mock_demo_setup_screen.cc

@@ -4,9 +4,6 @@
 
 #include "chrome/browser/chromeos/login/screens/mock_demo_setup_screen.h"
 
-using ::testing::AtLeast;
-using ::testing::NotNull;
-
 namespace chromeos {
 
 MockDemoSetupScreen::MockDemoSetupScreen(
@@ -16,9 +13,7 @@ MockDemoSetupScreen::MockDemoSetupScreen(
 
 MockDemoSetupScreen::~MockDemoSetupScreen() = default;
 
-MockDemoSetupScreenView::MockDemoSetupScreenView() {
-  EXPECT_CALL(*this, MockBind(NotNull())).Times(AtLeast(1));
-}
+MockDemoSetupScreenView::MockDemoSetupScreenView() = default;
 
 MockDemoSetupScreenView::~MockDemoSetupScreenView() {
   if (screen_)

chrome/browser/chromeos/login/screens/mock_demo_setup_screen.h

@@ -17,6 +17,9 @@ class MockDemoSetupScreen : public DemoSetupScreen {
   MockDemoSetupScreen(BaseScreenDelegate* base_screen_delegate,
                       DemoSetupScreenView* view);
   ~MockDemoSetupScreen() override;
+
+  MOCK_METHOD0(Show, void());
+  MOCK_METHOD0(Hide, void());
 };
 
 class MockDemoSetupScreenView : public DemoSetupScreenView {
@@ -34,7 +37,7 @@ class MockDemoSetupScreenView : public DemoSetupScreenView {
   void Bind(DemoSetupScreen* screen) override;
 
  private:
-  DemoSetupScreen* screen_;
+  DemoSetupScreen* screen_ = nullptr;
 };
 
 }  // namespace chromeos

chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.cc

@@ -4,9 +4,6 @@
 
 #include "chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.h"
 
-using ::testing::AtLeast;
-using ::testing::NotNull;
-
 namespace chromeos {
 
 MockEnableDebuggingScreen::MockEnableDebuggingScreen(
@@ -16,9 +13,7 @@ MockEnableDebuggingScreen::MockEnableDebuggingScreen(
 
 MockEnableDebuggingScreen::~MockEnableDebuggingScreen() {}
 
-MockEnableDebuggingScreenView::MockEnableDebuggingScreenView() {
-  EXPECT_CALL(*this, MockSetDelegate(NotNull())).Times(AtLeast(1));
-}
+MockEnableDebuggingScreenView::MockEnableDebuggingScreenView() = default;
 
 MockEnableDebuggingScreenView::~MockEnableDebuggingScreenView() {
   if (delegate_)

chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.h

@@ -17,6 +17,9 @@ class MockEnableDebuggingScreen : public EnableDebuggingScreen {
   MockEnableDebuggingScreen(BaseScreenDelegate* base_screen_delegate,
                             EnableDebuggingScreenView* view);
   ~MockEnableDebuggingScreen() override;
+
+  MOCK_METHOD0(Show, void());
+  MOCK_METHOD0(Hide, void());
 };
 
 class MockEnableDebuggingScreenView : public EnableDebuggingScreenView {

chrome/browser/chromeos/login/screens/mock_eula_screen.h

@@ -18,6 +18,9 @@ class MockEulaScreen : public EulaScreen {
                  Delegate* delegate,
                  EulaView* view);
   ~MockEulaScreen() override;
+
+  MOCK_METHOD0(Show, void());
+  MOCK_METHOD0(Hide, void());
 };
 
 class MockEulaView : public EulaView {

chrome/browser/chromeos/login/screens/mock_supervision_transition_screen.cc

@@ -4,9 +4,6 @@
 
 #include "chrome/browser/chromeos/login/screens/mock_supervision_transition_screen.h"
 
-using ::testing::_;
-using ::testing::AtLeast;
-
 namespace chromeos {
 
 MockSupervisionTransitionScreen::MockSupervisionTransitionScreen(
@@ -16,9 +13,8 @@ MockSupervisionTransitionScreen::MockSupervisionTransitionScreen(
 
 MockSupervisionTransitionScreen::~MockSupervisionTransitionScreen() = default;
 
-MockSupervisionTransitionScreenView::MockSupervisionTransitionScreenView() {
-  EXPECT_CALL(*this, MockBind(_)).Times(AtLeast(1));
-}
+MockSupervisionTransitionScreenView::MockSupervisionTransitionScreenView() =
+    default;
 
 MockSupervisionTransitionScreenView::~MockSupervisionTransitionScreenView() {
   if (screen_)

chrome/browser/chromeos/login/screens/mock_update_screen.h

@@ -17,6 +17,8 @@ class MockUpdateScreen : public UpdateScreen {
   MockUpdateScreen(BaseScreenDelegate* base_screen_delegate, UpdateView* view);
   virtual ~MockUpdateScreen();
 
+  MOCK_METHOD0(Show, void());
+  MOCK_METHOD0(Hide, void());
   MOCK_METHOD0(StartNetworkCheck, void());
 };
 

chrome/browser/chromeos/login/screens/mock_welcome_screen.cc

@@ -6,9 +6,6 @@
 
 namespace chromeos {
 
-using ::testing::AtLeast;
-using ::testing::_;
-
 MockWelcomeScreen::MockWelcomeScreen(BaseScreenDelegate* base_screen_delegate,
                                      Delegate* delegate,
                                      WelcomeView* view)
@@ -16,9 +13,7 @@ MockWelcomeScreen::MockWelcomeScreen(BaseScreenDelegate* base_screen_delegate,
 
 MockWelcomeScreen::~MockWelcomeScreen() = default;
 
-MockWelcomeView::MockWelcomeView() {
-  EXPECT_CALL(*this, MockBind(_)).Times(AtLeast(1));
-}
+MockWelcomeView::MockWelcomeView() = default;
 
 MockWelcomeView::~MockWelcomeView() {
   if (screen_)

chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.cc

@@ -4,9 +4,6 @@
 
 #include "chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.h"
 
-using testing::AtLeast;
-using testing::NotNull;
-
 namespace chromeos {
 
 MockWrongHWIDScreen::MockWrongHWIDScreen(
@@ -16,9 +13,7 @@ MockWrongHWIDScreen::MockWrongHWIDScreen(
 
 MockWrongHWIDScreen::~MockWrongHWIDScreen() {}
 
-MockWrongHWIDScreenView::MockWrongHWIDScreenView() : delegate_(nullptr) {
-  EXPECT_CALL(*this, MockSetDelegate(NotNull())).Times(AtLeast(1));
-}
+MockWrongHWIDScreenView::MockWrongHWIDScreenView() = default;
 
 MockWrongHWIDScreenView::~MockWrongHWIDScreenView() {
   if (delegate_)

chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.h

@@ -18,6 +18,9 @@ class MockWrongHWIDScreen : public WrongHWIDScreen {
   MockWrongHWIDScreen(BaseScreenDelegate* base_screen_delegate,
                       WrongHWIDScreenView* view);
   ~MockWrongHWIDScreen() override;
+
+  MOCK_METHOD0(Show, void());
+  MOCK_METHOD0(Hide, void());
 };
 
 class MockWrongHWIDScreenView : public WrongHWIDScreenView {
@@ -32,7 +35,7 @@ class MockWrongHWIDScreenView : public WrongHWIDScreenView {
   MOCK_METHOD1(MockSetDelegate, void(Delegate*));
 
  private:
-  Delegate* delegate_;
+  Delegate* delegate_ = nullptr;
 };
 
 }  // namespace chromeos