Revert "Reland "cros: Remove WizardInProcessBrowserTest""

This reverts commit 56848201.

Reason for revert: WizardControllerDeviceStateTest.ControlFlowDeviceDisabled timing out on linux-chromeos-dbg

https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/linux-chromeos-dbg/9330

Original change's description:
> Reland "cros: Remove WizardInProcessBrowserTest"
> 
> Reason for revert: the failing test was flaky without this change and has since been disabled (crbug.com/911154)
> 
> Original change's description:
> > Revert "cros: Remove WizardInProcessBrowserTest"
> > 
> > This reverts commit 92925c66.
> > 
> > Reason for revert: WizardControllerDeviceState*Test timing out on linux-chromeos-dbg
> > 
> > https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/linux-chromeos-dbg/9248
> > 
> > rowserTestBase received signal: Terminated. Backtrace:
> > #0 0x7feb2e8b3fed base::debug::StackTrace::StackTrace()
> > #1 0x7feb2e5addfa base::debug::StackTrace::StackTrace()
> > #2 0x563fac6dc0f2 content::(anonymous namespace)::DumpStackTraceSignalHandler()
> > #3 0x7feafb349cb0 <unknown>
> > #4 0x7feafb4116d3 epoll_wait
> > #5 0x7feb2e96353f epoll_dispatch
> > #6 0x7feb2e956cc5 event_base_loop
> > #7 0x7feb2e9073c9 base::MessagePumpLibevent::Run()
> > #8 0x7feb2e63fbe6 base::MessageLoopImpl::Run()
> > #9 0x7feb2e6eb322 base::RunLoop::Run()
> > #10 0x563fa6018304 chromeos::WizardControllerDeviceStateTest::WaitForAutoEnrollmentState()
> > #11 0x563fa5ffeb8f chromeos::WizardControllerDeviceStateExplicitRequirementTest_ControlFlowForcedReEnrollment_Test::RunTestOnMainThread()
> > 
> > Original change's description:
> > > cros: Remove WizardInProcessBrowserTest
> > > 
> > > The base class convoluted the inheritance structure and it is simpler to
> > > directly derive from InProcessBrowserTest.
> > > 
> > > Bug: 899777
> > > Change-Id: I04b8e4d48d0a28a8d4481891d5379456df32d0d6
> > > Reviewed-on: https://chromium-review.googlesource.com/c/1345244
> > > Commit-Queue: Jacob Dufault <jdufault@chromium.org>
> > > Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
> > > Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#612394}
> > 
> > TBR=xiyuan@chromium.org,emaxx@chromium.org,jdufault@chromium.org
> > 
> > Change-Id: I06cfea778c8246795a8bb8fdc9878812a1ab5d52
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: 899777
> > Reviewed-on: https://chromium-review.googlesource.com/c/1356168
> > Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org>
> > Commit-Queue: Giovanni Ortuño Urquidi <ortuno@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#612523}
> 
> TBR=xiyuan@chromium.org,emaxx@chromium.org,jdufault@chromium.org,ortuno@chromium.org
> 
> # Not skipping CQ checks because original CL landed > 1 day ago.
> 
> Bug: 899777
> Change-Id: Id6a54d588736969830db39963f5cc4560d1068b9
> Reviewed-on: https://chromium-review.googlesource.com/c/1359135
> Reviewed-by: Jacob Dufault <jdufault@chromium.org>
> Commit-Queue: Jacob Dufault <jdufault@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#613244}

TBR=xiyuan@chromium.org,emaxx@chromium.org,jdufault@chromium.org,ortuno@chromium.org

Change-Id: Ifeec16d8f954fd9a9aede38a2fa0bffcc107dab4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 899777
Reviewed-on: https://chromium-review.googlesource.com/c/1359815Reviewed-by: Ovidio Henriquez <odejesush@chromium.org>
Commit-Queue: Ovidio Henriquez <odejesush@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613359}

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

@@ -8,16 +8,15 @@
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
 #include "chrome/browser/chromeos/login/enrollment/mock_enrollment_screen.h"
-#include "chrome/browser/chromeos/login/login_wizard.h"
 #include "chrome/browser/chromeos/login/oobe_screen.h"
 #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/test/js_checker.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
+#include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/chromeos_test_utils.h"
 #include "content/public/test/test_utils.h"
@@ -30,20 +29,10 @@ using testing::_;
 
 namespace chromeos {
 
-class EnrollmentScreenTest : public InProcessBrowserTest {
+class EnrollmentScreenTest : public WizardInProcessBrowserTest {
  public:
-  EnrollmentScreenTest() = default;
-  ~EnrollmentScreenTest() override = default;
-
-  // InProcessBrowserTest:
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    InProcessBrowserTest::SetUpCommandLine(command_line);
-    command_line->AppendArg(switches::kLoginManager);
-  }
-  void SetUpOnMainThread() override {
-    InProcessBrowserTest::SetUpOnMainThread();
-    ShowLoginWizard(OobeScreen::SCREEN_OOBE_ENROLLMENT);
-  }
+  EnrollmentScreenTest()
+      : WizardInProcessBrowserTest(OobeScreen::SCREEN_OOBE_ENROLLMENT) {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EnrollmentScreenTest);

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

@@ -6,13 +6,12 @@
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_mock.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
-#include "chrome/browser/chromeos/login/login_wizard.h"
 #include "chrome/browser/chromeos/login/oobe_screen.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
+#include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
-#include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_service_client.h"
@@ -32,23 +31,21 @@ constexpr char kDefaultNetworkServicePath[] = "/service/eth1";
 }  // namespace
 
 // Hands-off enrollment flow test.
-class HandsOffEnrollmentTest : public InProcessBrowserTest {
+class HandsOffEnrollmentTest : public WizardInProcessBrowserTest {
  protected:
-  HandsOffEnrollmentTest() {}
+  HandsOffEnrollmentTest()
+      : WizardInProcessBrowserTest(OobeScreen::SCREEN_TEST_NO_WINDOW) {}
   ~HandsOffEnrollmentTest() override = default;
 
-  // InProcessBrowserTest:
+  // WizardInProcessBrowserTest:
   void SetUpCommandLine(base::CommandLine* command_line) override {
-    InProcessBrowserTest::SetUpCommandLine(command_line);
-    command_line->AppendArg(switches::kLoginManager);
+    WizardInProcessBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(
         switches::kEnterpriseEnableZeroTouchEnrollment, "hands-off");
   }
 
   void SetUpOnMainThread() override {
-    InProcessBrowserTest::SetUpOnMainThread();
-    ShowLoginWizard(OobeScreen::SCREEN_TEST_NO_WINDOW);
-
+    WizardInProcessBrowserTest::SetUpOnMainThread();
     // Set official build so EULA screen is not skipped by default.
     WizardController::default_controller()->is_official_build_ = true;
 

chrome/browser/chromeos/login/screen_manager.h

@@ -31,6 +31,7 @@ class ScreenManager {
   FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, Accelerators);
   friend class WizardControllerFlowTest;
   friend class WizardControllerOobeResumeTest;
+  friend class WizardInProcessBrowserTest;
   friend class WizardControllerBrokenLocalStateTest;
   friend class WizardControllerOobeConfigurationTest;
 

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

@@ -4,13 +4,11 @@
 
 #include "base/macros.h"
 #include "base/run_loop.h"
-#include "chrome/browser/chromeos/login/login_wizard.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
 #include "chrome/browser/chromeos/login/screens/hid_detection_screen.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
+#include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "chromeos/chromeos_switches.h"
 #include "services/device/public/cpp/hid/fake_input_service_linux.h"
 #include "services/device/public/mojom/constants.mojom.h"
 #include "services/device/public/mojom/input_service.mojom.h"
@@ -18,9 +16,10 @@
 
 namespace chromeos {
 
-class HIDDetectionScreenTest : public InProcessBrowserTest {
+class HIDDetectionScreenTest : public WizardInProcessBrowserTest {
  public:
-  HIDDetectionScreenTest() {
+  HIDDetectionScreenTest()
+      : WizardInProcessBrowserTest(OobeScreen::SCREEN_OOBE_HID_DETECTION) {
     fake_input_service_manager_ =
         std::make_unique<device::FakeInputServiceLinux>();
 
@@ -35,14 +34,9 @@ class HIDDetectionScreenTest : public InProcessBrowserTest {
         device::mojom::InputDeviceManager>(device::mojom::kServiceName);
   }
 
-  // InProcessBrowserTest:
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    InProcessBrowserTest::SetUpCommandLine(command_line);
-    command_line->AppendArg(switches::kLoginManager);
-  }
-
+ protected:
   void SetUpOnMainThread() override {
-    ShowLoginWizard(OobeScreen::SCREEN_OOBE_HID_DETECTION);
+    WizardInProcessBrowserTest::SetUpOnMainThread();
     ASSERT_TRUE(WizardController::default_controller());
 
     hid_detection_screen_ = static_cast<HIDDetectionScreen*>(
@@ -56,6 +50,10 @@ class HIDDetectionScreenTest : public InProcessBrowserTest {
     hid_detection_screen()->SetAdapterInitialPoweredForTesting(false);
   }
 
+  void TearDownOnMainThread() override {
+    WizardInProcessBrowserTest::TearDownOnMainThread();
+  }
+
   HIDDetectionScreen* hid_detection_screen() { return hid_detection_screen_; }
 
   scoped_refptr<device::BluetoothAdapter> adapter() {

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

@@ -11,14 +11,13 @@
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
 #include "chrome/browser/chromeos/login/helper.h"
-#include "chrome/browser/chromeos/login/login_wizard.h"
 #include "chrome/browser/chromeos/login/mock_network_state_helper.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
 #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
+#include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
@@ -43,29 +42,27 @@ class DummyButtonListener : public views::ButtonListener {
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {}
 };
 
-class NetworkScreenTest : public InProcessBrowserTest {
+class NetworkScreenTest : public WizardInProcessBrowserTest {
  public:
-  NetworkScreenTest() = default;
+  NetworkScreenTest()
+      : WizardInProcessBrowserTest(OobeScreen::SCREEN_OOBE_NETWORK) {}
   ~NetworkScreenTest() override = default;
 
-  // InProcessBrowserTest:
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    InProcessBrowserTest::SetUpCommandLine(command_line);
-    command_line->AppendArg(switches::kLoginManager);
-  }
-
+ protected:
   void SetUpInProcessBrowserTestFixture() override {
-    InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
+    WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
+
     DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
         std::make_unique<FakeSessionManagerClient>());
   }
 
   void SetUpOnMainThread() override {
-    InProcessBrowserTest::SetUpOnMainThread();
-    ShowLoginWizard(OobeScreen::SCREEN_OOBE_NETWORK);
+    WizardInProcessBrowserTest::SetUpOnMainThread();
     mock_base_screen_delegate_ = std::make_unique<MockBaseScreenDelegate>();
+    ASSERT_TRUE(WizardController::default_controller() != nullptr);
     network_screen_ = NetworkScreen::Get(
         WizardController::default_controller()->screen_manager());
+    ASSERT_TRUE(network_screen_ != nullptr);
     ASSERT_EQ(WizardController::default_controller()->current_screen(),
               network_screen_);
     network_screen_->base_screen_delegate_ = mock_base_screen_delegate_.get();
@@ -80,65 +77,63 @@ class NetworkScreenTest : public InProcessBrowserTest {
     EXPECT_CALL(*mock_base_screen_delegate_,
                 OnExit(ScreenExitCode::NETWORK_CONNECTED))
         .Times(1);
-    EXPECT_CALL(*network_state_helper(), IsConnected()).WillOnce(Return(true));
+    EXPECT_CALL(*mock_network_state_helper_, IsConnected())
+        .WillOnce(Return(true));
     network_screen->OnContinueButtonClicked();
     base::RunLoop().RunUntilIdle();
   }
 
   void SetDefaultNetworkStateHelperExpectations() {
-    EXPECT_CALL(*network_state_helper(), GetCurrentNetworkName())
+    EXPECT_CALL(*mock_network_state_helper_, GetCurrentNetworkName())
         .Times(AnyNumber())
         .WillRepeatedly((Return(base::string16())));
-    EXPECT_CALL(*network_state_helper(), IsConnected())
+    EXPECT_CALL(*mock_network_state_helper_, IsConnected())
         .Times(AnyNumber())
         .WillRepeatedly((Return(false)));
-    EXPECT_CALL(*network_state_helper(), IsConnecting())
+    EXPECT_CALL(*mock_network_state_helper_, IsConnecting())
         .Times(AnyNumber())
         .WillRepeatedly((Return(false)));
   }
 
-  login::MockNetworkStateHelper* network_state_helper() {
-    return mock_network_state_helper_;
-  }
-  NetworkScreen* network_screen() { return network_screen_; }
-
- private:
   std::unique_ptr<MockBaseScreenDelegate> mock_base_screen_delegate_;
   login::MockNetworkStateHelper* mock_network_state_helper_;
   NetworkScreen* network_screen_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(NetworkScreenTest);
 };
 
 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, CanConnect) {
-  EXPECT_CALL(*network_state_helper(), IsConnecting()).WillOnce((Return(true)));
+  EXPECT_CALL(*mock_network_state_helper_, IsConnecting())
+      .WillOnce((Return(true)));
   // EXPECT_FALSE(view_->IsContinueEnabled());
-  network_screen()->UpdateStatus();
+  network_screen_->UpdateStatus();
 
-  EXPECT_CALL(*network_state_helper(), IsConnected())
+  EXPECT_CALL(*mock_network_state_helper_, IsConnected())
       .Times(2)
       .WillRepeatedly(Return(true));
   // TODO(nkostylev): Add integration with WebUI view http://crosbug.com/22570
   // EXPECT_FALSE(view_->IsContinueEnabled());
   // EXPECT_FALSE(view_->IsConnecting());
-  network_screen()->UpdateStatus();
+  network_screen_->UpdateStatus();
 
   // EXPECT_TRUE(view_->IsContinueEnabled());
-  EmulateContinueButtonExit(network_screen());
+  EmulateContinueButtonExit(network_screen_);
 }
 
 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Timeout) {
-  EXPECT_CALL(*network_state_helper(), IsConnecting()).WillOnce((Return(true)));
+  EXPECT_CALL(*mock_network_state_helper_, IsConnecting())
+      .WillOnce((Return(true)));
   // EXPECT_FALSE(view_->IsContinueEnabled());
-  network_screen()->UpdateStatus();
+  network_screen_->UpdateStatus();
 
-  EXPECT_CALL(*network_state_helper(), IsConnected())
+  EXPECT_CALL(*mock_network_state_helper_, IsConnected())
       .Times(2)
       .WillRepeatedly(Return(false));
   // TODO(nkostylev): Add integration with WebUI view http://crosbug.com/22570
   // EXPECT_FALSE(view_->IsContinueEnabled());
   // EXPECT_FALSE(view_->IsConnecting());
-  network_screen()->OnConnectionTimeout();
+  network_screen_->OnConnectionTimeout();
 
   // Close infobubble with error message - it makes the test stable.
   // EXPECT_FALSE(view_->IsContinueEnabled());

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

@@ -10,16 +10,14 @@
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/login/login_wizard.h"
 #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h"
 #include "chrome/browser/chromeos/login/screens/network_error.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
-#include "chrome/browser/chromeos/login/ui/login_display_host.h"
+#include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_update_engine_client.h"
@@ -44,18 +42,20 @@ const char kStubWifiGuid[] = "wlan0";
 
 }  // namespace
 
-class UpdateScreenTest : public InProcessBrowserTest {
+class UpdateScreenTest : public WizardInProcessBrowserTest {
  public:
-  UpdateScreenTest() = default;
-  ~UpdateScreenTest() override = default;
+  UpdateScreenTest()
+      : WizardInProcessBrowserTest(OobeScreen::SCREEN_OOBE_UPDATE),
+        fake_update_engine_client_(nullptr),
+        network_portal_detector_(nullptr) {}
 
-  // InProcessBrowserTest:
+ protected:
   void SetUpInProcessBrowserTestFixture() override {
-    fake_update_engine_client_ = new FakeUpdateEngineClient();
+    fake_update_engine_client_ = new FakeUpdateEngineClient;
     chromeos::DBusThreadManager::GetSetterForTesting()->SetUpdateEngineClient(
         std::unique_ptr<UpdateEngineClient>(fake_update_engine_client_));
 
-    InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
+    WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
 
     // Setup network portal detector to return online state for both
     // ethernet and wifi networks. Ethernet is an active network by
@@ -81,7 +81,7 @@ class UpdateScreenTest : public InProcessBrowserTest {
         .Times(AnyNumber())
         .WillRepeatedly(Return(mock_error_screen_.get()));
 
-    ShowLoginWizard(OobeScreen::SCREEN_OOBE_UPDATE);
+    WizardInProcessBrowserTest::SetUpOnMainThread();
 
     ASSERT_TRUE(WizardController::default_controller() != nullptr);
     update_screen_ = UpdateScreen::Get(
@@ -93,22 +93,16 @@ class UpdateScreenTest : public InProcessBrowserTest {
   }
 
   void TearDownOnMainThread() override {
-    InProcessBrowserTest::TearDownOnMainThread();
-
-    base::RunLoop run_loop;
-    LoginDisplayHost::default_host()->Finalize(run_loop.QuitClosure());
-    run_loop.Run();
-
+    WizardInProcessBrowserTest::TearDownOnMainThread();
     mock_error_screen_.reset();
     mock_network_error_view_.reset();
   }
 
   void TearDownInProcessBrowserTestFixture() override {
     network_portal_detector::Shutdown();
-    InProcessBrowserTest::TearDownInProcessBrowserTestFixture();
+    WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture();
   }
 
- protected:
   void SetDefaultNetwork(const std::string& guid) {
     DCHECK(network_portal_detector_);
     network_portal_detector_->SetDefaultNetworkForTesting(guid);
@@ -126,13 +120,12 @@ class UpdateScreenTest : public InProcessBrowserTest {
     network_portal_detector_->NotifyObserversForTesting();
   }
 
+  FakeUpdateEngineClient* fake_update_engine_client_;
   std::unique_ptr<MockBaseScreenDelegate> mock_base_screen_delegate_;
   std::unique_ptr<MockNetworkErrorView> mock_network_error_view_;
   std::unique_ptr<MockErrorScreen> mock_error_screen_;
-  FakeUpdateEngineClient* fake_update_engine_client_ = nullptr;  // Unowned.
-  UpdateScreen* update_screen_ = nullptr;                        // Unowned.
-  NetworkPortalDetectorTestImpl* network_portal_detector_ =
-      nullptr;  // Unowned.
+  UpdateScreen* update_screen_;
+  NetworkPortalDetectorTestImpl* network_portal_detector_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(UpdateScreenTest);

chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h

+// Copyright 2014 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.
+
+#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_TEST_WIZARD_IN_PROCESS_BROWSER_TEST_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_TEST_WIZARD_IN_PROCESS_BROWSER_TEST_H_
+
+#include <string>
+
+#include "base/compiler_specific.h"
+#include "base/macros.h"
+#include "chrome/browser/chromeos/login/oobe_screen.h"
+#include "chrome/test/base/in_process_browser_test.h"
+
+namespace chromeos {
+
+class LoginDisplayHost;
+
+// Base class for test related to login wizard and its screens.
+// Instead of creating Chrome browser window it creates login wizard window
+// with specified parameters and allows to customize environment at the
+// right moment in time before wizard is created.
+class WizardInProcessBrowserTest : public InProcessBrowserTest {
+ public:
+  explicit WizardInProcessBrowserTest(OobeScreen screen);
+
+  // Overridden from InProcessBrowserTest:
+  void SetUp() override;
+
+ protected:
+  // Can be overriden by derived test fixtures to set up environment after
+  // browser is created but wizard is not shown yet.
+  virtual void SetUpWizard() {}
+
+  // Overriden from InProcessBrowserTest:
+  void SetUpOnMainThread() override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
+  void TearDownOnMainThread() override;
+
+ private:
+  OobeScreen screen_;
+  LoginDisplayHost* host_ = nullptr;
+
+  DISALLOW_COPY_AND_ASSIGN(WizardInProcessBrowserTest);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_TEST_WIZARD_IN_PROCESS_BROWSER_TEST_H_

chrome/browser/chromeos/login/wizard_controller.h

@@ -469,6 +469,7 @@ class WizardController : public BaseScreenDelegate,
   friend class WizardControllerFlowTest;
   friend class WizardControllerOobeConfigurationTest;
   friend class WizardControllerOobeResumeTest;
+  friend class WizardInProcessBrowserTest;
 
   std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
 

chrome/browser/chromeos/login/wizard_controller_browsertest.cc

@@ -25,7 +25,6 @@
 #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/login_wizard.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"
@@ -46,6 +45,7 @@
 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/test/oobe_configuration_waiter.h"
+#include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
@@ -62,7 +62,6 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
-#include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/chromeos_test_utils.h"
@@ -347,15 +346,16 @@ class MockOutShowHide : public T {
   EXPECT_CALL(*mock_var, Show()).Times(0);                                  \
   EXPECT_CALL(*mock_var, Hide()).Times(0);
 
-class WizardControllerTest : public InProcessBrowserTest {
+class WizardControllerTest : public WizardInProcessBrowserTest {
  protected:
-  WizardControllerTest() = default;
-  ~WizardControllerTest() override = default;
+  WizardControllerTest()
+      : WizardInProcessBrowserTest(OobeScreen::SCREEN_TEST_NO_WINDOW) {}
+  ~WizardControllerTest() override {}
 
   void SetUpOnMainThread() override {
     AccessibilityManager::Get()->SetProfileForTest(
         ProfileHelper::GetSigninProfile());
-    ShowLoginWizard(OobeScreen::SCREEN_TEST_NO_WINDOW);
+    WizardInProcessBrowserTest::SetUpOnMainThread();
   }
 
   ErrorScreen* GetErrorScreen() {

chrome/test/BUILD.gn

@@ -1745,6 +1745,8 @@ test("browser_tests") {
         "../browser/chromeos/login/test/https_forwarder.h",
         "../browser/chromeos/login/test/oobe_base_test.cc",
         "../browser/chromeos/login/test/oobe_base_test.h",
+        "../browser/chromeos/login/test/wizard_in_process_browser_test.cc",
+        "../browser/chromeos/login/test/wizard_in_process_browser_test.h",
         "../browser/chromeos/login/ui/captive_portal_window_browsertest.cc",
         "../browser/chromeos/login/ui/login_feedback_browsertest.cc",
         "../browser/chromeos/login/ui/login_web_dialog_browsertest.cc",