| Index: chrome/browser/chromeos/login/login_manager_test.cc
|
| diff --git a/chrome/browser/chromeos/login/login_manager_test.cc b/chrome/browser/chromeos/login/login_manager_test.cc
|
| index 40a5836bb888f3d6d49305c0d2fd8abf2cd4b2e9..a6f7a761a578869397bf61b033ab86fdbc9f477c 100644
|
| --- a/chrome/browser/chromeos/login/login_manager_test.cc
|
| +++ b/chrome/browser/chromeos/login/login_manager_test.cc
|
| @@ -30,6 +30,7 @@ LoginManagerTest::LoginManagerTest(bool should_launch_browser)
|
| }
|
|
|
| void LoginManagerTest::TearDownOnMainThread() {
|
| + MixinInProcessBrowserTest::TearDownOnMainThread();
|
| if (LoginDisplayHostImpl::default_host())
|
| LoginDisplayHostImpl::default_host()->Finalize();
|
| base::MessageLoop::current()->RunUntilIdle();
|
| @@ -38,6 +39,7 @@ void LoginManagerTest::TearDownOnMainThread() {
|
| void LoginManagerTest::SetUpCommandLine(CommandLine* command_line) {
|
| command_line->AppendSwitch(chromeos::switches::kLoginManager);
|
| command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
|
| + MixinInProcessBrowserTest::SetUpCommandLine(command_line);
|
| }
|
|
|
| void LoginManagerTest::SetUpInProcessBrowserTestFixture() {
|
| @@ -46,6 +48,7 @@ void LoginManagerTest::SetUpInProcessBrowserTestFixture() {
|
| mock_login_utils_->GetFakeLoginUtils()->set_should_launch_browser(
|
| should_launch_browser_);
|
| LoginUtils::Set(mock_login_utils_);
|
| + MixinInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
|
| }
|
|
|
| void LoginManagerTest::SetUpOnMainThread() {
|
| @@ -53,6 +56,7 @@ void LoginManagerTest::SetUpOnMainThread() {
|
| chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
|
| content::NotificationService::AllSources()).Wait();
|
| InitializeWebContents();
|
| + MixinInProcessBrowserTest::SetUpOnMainThread();
|
| }
|
|
|
| void LoginManagerTest::RegisterUser(const std::string& user_id) {
|
|
|