Componentize LoginManagerTest.

chrome/browser/chromeos/login/wallpaper_manager_policy_browsertest.cc

Index: chrome/browser/chromeos/login/wallpaper_manager_policy_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wallpaper_manager_policy_browsertest.cc b/chrome/browser/chromeos/login/wallpaper_manager_policy_browsertest.cc
index d4751fe6fd79b828a5313e28a4ac2119781094bc..215ab6127d804cb51bdd0cda48af499795e5778a 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager_policy_browsertest.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager_policy_browsertest.cc
@@ -18,7 +18,7 @@
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
-#include "chrome/browser/chromeos/login/login_manager_test.h"
+#include "chrome/browser/chromeos/login/login_manager_test_helper.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ -29,6 +29,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
@@ -130,15 +131,16 @@ SkColor GetAverageBackgroundColor() {
 }  // namespace
 
 class WallpaperManagerPolicyTest
-    : public LoginManagerTest,
+    : public InProcessBrowserTest,
       public ash::DesktopBackgroundControllerObserver,
       public testing::WithParamInterface<bool> {
  protected:
   WallpaperManagerPolicyTest()
-      : LoginManagerTest(true),
-        wallpaper_change_count_(0),
+      : wallpaper_change_count_(0),
+        login_manager_test_helper_(new LoginManagerTestHelper(true)),
         fake_dbus_thread_manager_(new FakeDBusThreadManager),
         fake_session_manager_client_(new FakeSessionManagerClient) {
+    set_exit_when_last_browser_closes(false);
     fake_dbus_thread_manager_->SetFakeClients();
     fake_dbus_thread_manager_->SetSessionManagerClient(
         scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
@@ -171,15 +173,15 @@ class WallpaperManagerPolicyTest
   // LoginManagerTest:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     DBusThreadManager::SetInstanceForTesting(fake_dbus_thread_manager_);
-    LoginManagerTest::SetUpInProcessBrowserTestFixture();
+    login_manager_test_helper_->SetUpLoginUtils();
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    // Set the same switches as LoginManagerTest, except that kMultiProfiles is
-    // only set when GetParam() is true and except that kLoginProfile is set
-    // when GetParam() is false.  The latter seems to be required for the sane
-    // start-up of user profiles.
+    // Set the same switches as LoginManagerTestHelper, except that
+    // kMultiProfiles is only set when GetParam() is true and kLoginProfile is
+    // set when GetParam() is false.  The latter seems to be required for the
+    // sanestart-up of user profiles.

[michaelpg, 2014/05/07 00:55:05]

"sane start-up"

[michaelpg, 2014/05/07 02:48:24]

Done.

     command_line->AppendSwitch(switches::kLoginManager);
     command_line->AppendSwitch(switches::kForceLoginManagerInTests);
     if (GetParam())
@@ -189,7 +191,7 @@ class WallpaperManagerPolicyTest
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    LoginManagerTest::SetUpOnMainThread();
+    login_manager_test_helper_->SetUp();
     ash::Shell::GetInstance()->
         desktop_background_controller()->AddObserver(this);
 
@@ -203,7 +205,11 @@ class WallpaperManagerPolicyTest
   virtual void TearDownOnMainThread() OVERRIDE {
     ash::Shell::GetInstance()->
         desktop_background_controller()->RemoveObserver(this);
-    LoginManagerTest::TearDownOnMainThread();
+    InProcessBrowserTest::TearDownOnMainThread();
+  }
+
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    login_manager_test_helper_->CleanUp();
   }
 
   // ash::DesktopBackgroundControllerObserver:
@@ -269,6 +275,7 @@ class WallpaperManagerPolicyTest
   base::FilePath test_data_dir_;
   scoped_ptr<base::RunLoop> run_loop_;
   int wallpaper_change_count_;
+  scoped_ptr<LoginManagerTestHelper> login_manager_test_helper_;
   scoped_ptr<policy::UserPolicyBuilder> user_policy_builders_[2];
   FakeDBusThreadManager* fake_dbus_thread_manager_;
   FakeSessionManagerClient* fake_session_manager_client_;
@@ -278,8 +285,8 @@ class WallpaperManagerPolicyTest
 };
 
 IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PRE_SetResetClear) {
-  RegisterUser(kTestUsers[0]);
-  RegisterUser(kTestUsers[1]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[0]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[1]);
   StartupUtils::MarkOobeCompleted();
 }
 
@@ -289,7 +296,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PRE_SetResetClear) {
 // reverts to default.
 IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, SetResetClear) {
   WallpaperInfo info;
-  LoginUser(kTestUsers[0]);
+  login_manager_test_helper_->LogInUser(kTestUsers[0]);
   base::RunLoop().RunUntilIdle();
 
   // First user: Wait until default wallpaper has been loaded (happens
@@ -330,14 +337,14 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, SetResetClear) {
 
 IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest,
                        PRE_PRE_PRE_WallpaperOnLoginScreen) {
-  RegisterUser(kTestUsers[0]);
-  RegisterUser(kTestUsers[1]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[0]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[1]);
   StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest,
                        PRE_PRE_WallpaperOnLoginScreen) {
-  LoginUser(kTestUsers[0]);
+  login_manager_test_helper_->LogInUser(kTestUsers[0]);
 
   // Wait until default wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
@@ -351,7 +358,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest,
 }
 
 IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PRE_WallpaperOnLoginScreen) {
-  LoginUser(kTestUsers[1]);
+  login_manager_test_helper_->LogInUser(kTestUsers[1]);
 
   // Wait until default wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
@@ -380,12 +387,12 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, WallpaperOnLoginScreen) {
 }
 
 IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PRE_PRE_PersistOverLogout) {
-  RegisterUser(kTestUsers[0]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[0]);
   StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PRE_PersistOverLogout) {
-  LoginUser(kTestUsers[0]);
+  login_manager_test_helper_->LogInUser(kTestUsers[0]);
 
   // Wait until default wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
@@ -399,7 +406,7 @@ IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PRE_PersistOverLogout) {
 }
 
 IN_PROC_BROWSER_TEST_P(WallpaperManagerPolicyTest, PersistOverLogout) {
-  LoginUser(kTestUsers[0]);
+  login_manager_test_helper_->LogInUser(kTestUsers[0]);
 
   // Wait until wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);