Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Unified Diff: chrome/browser/chromeos/login/login_manager_test.cc

Issue 574703002: Creating mixin-supporting InProcessBrowserTests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: edited .gypi so that it links correctly everywhere where LoginManagerTest appears Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..556766ff231ec765f9744e65fd8c03d0551ec8d2 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() {
+ MixinBasedBrowserTest::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);
+ MixinBasedBrowserTest::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_);
+ MixinBasedBrowserTest::SetUpInProcessBrowserTestFixture();
}
void LoginManagerTest::SetUpOnMainThread() {
@@ -53,6 +56,7 @@ void LoginManagerTest::SetUpOnMainThread() {
chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
content::NotificationService::AllSources()).Wait();
InitializeWebContents();
+ MixinBasedBrowserTest::SetUpOnMainThread();
}
void LoginManagerTest::RegisterUser(const std::string& user_id) {
« no previous file with comments | « chrome/browser/chromeos/login/login_manager_test.h ('k') | chrome/browser/chromeos/login/mixin_based_browser_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698