Componentize LoginManagerTest.

chrome/browser/chromeos/login/user_image_manager_browsertest.cc

Index: chrome/browser/chromeos/login/user_image_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/login/user_image_manager_browsertest.cc b/chrome/browser/chromeos/login/user_image_manager_browsertest.cc
index 0bb9730b572624cc5bb63d9c7c8da2a779bcfca4..fb6b54d8db125a1e74ef999b1a49c108ea772e0a 100644
--- a/chrome/browser/chromeos/login/user_image_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/user_image_manager_browsertest.cc
@@ -26,7 +26,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/default_user_images.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/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/user.h"
@@ -94,29 +94,39 @@ policy::CloudPolicyStore* GetStoreForUser(const User* user) {
 
 }  // namespace
 
-class UserImageManagerTest : public LoginManagerTest,
+class UserImageManagerTest : public InProcessBrowserTest,
                              public UserManager::Observer {
  protected:
-  UserImageManagerTest() : LoginManagerTest(true) {
+  UserImageManagerTest()
+      : login_manager_test_helper_(new LoginManagerTestHelper(true)) {
+    set_exit_when_last_browser_closes(false);
   }
 
-  // LoginManagerTest overrides:
+  // InProcessBrowserTest overrides:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    LoginManagerTest::SetUpInProcessBrowserTestFixture();
+    login_manager_test_helper_->SetUpLoginUtils();
 
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
     ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir_));
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    LoginManagerTest::SetUpOnMainThread();
+    login_manager_test_helper_->SetUp();
     local_state_ = g_browser_process->local_state();
     UserManager::Get()->AddObserver(this);
   }
 
   virtual void TearDownOnMainThread() OVERRIDE {
     UserManager::Get()->RemoveObserver(this);
-    LoginManagerTest::TearDownOnMainThread();
+    InProcessBrowserTest::TearDownOnMainThread();
+  }
+
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    login_manager_test_helper_->SetUpCommandLine(command_line);
+  }
+
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    login_manager_test_helper_->CleanUp();
   }
 
   // UserManager::Observer overrides:
@@ -134,7 +144,7 @@ class UserImageManagerTest : public LoginManagerTest,
   void SetOldUserImageInfo(const std::string& username,
                            int image_index,
                            const base::FilePath& image_path) {
-    RegisterUser(username);
+    login_manager_test_helper_->RegisterUser(username);
     DictionaryPrefUpdate images_pref(local_state_, "UserImages");
     base::DictionaryValue* image_properties = new base::DictionaryValue();
     image_properties->Set(
@@ -290,7 +300,7 @@ class UserImageManagerTest : public LoginManagerTest,
   PrefService* local_state_;
 
   scoped_ptr<gfx::ImageSkia> decoded_image_;
-
+  scoped_ptr<LoginManagerTestHelper> login_manager_test_helper_;
   scoped_ptr<base::RunLoop> run_loop_;
 
  private:
@@ -388,7 +398,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, NonJPEGImageFromFile) {
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserDefaultImageIndex) {
-  RegisterUser(kTestUser1);
+  login_manager_test_helper_->RegisterUser(kTestUser1);
 }
 
 // Verifies that SaveUserDefaultImageIndex() correctly sets and persists the
@@ -411,7 +421,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserDefaultImageIndex) {
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserImage) {
-  RegisterUser(kTestUser1);
+  login_manager_test_helper_->RegisterUser(kTestUser1);
 }
 
 // Verifies that SaveUserImage() correctly sets and persists the chosen user
@@ -450,7 +460,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImage) {
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserImageFromFile) {
-  RegisterUser(kTestUser1);
+  login_manager_test_helper_->RegisterUser(kTestUser1);
 }
 
 // Verifies that SaveUserImageFromFile() correctly sets and persists the chosen
@@ -489,7 +499,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromFile) {
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
                        PRE_SaveUserImageFromProfileImage) {
-  RegisterUser(kTestUser1);
+  login_manager_test_helper_->RegisterUser(kTestUser1);
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
@@ -500,7 +510,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromProfileImage) {
   ASSERT_TRUE(user);
 
   UserImageManagerImpl::IgnoreProfileDataDownloadDelayForTesting();
-  LoginUser(kTestUser1);
+  login_manager_test_helper_->LogInUser(kTestUser1);
 
   run_loop_.reset(new base::RunLoop);
   UserImageManager* user_image_manager =
@@ -533,7 +543,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromProfileImage) {
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
                        PRE_ProfileImageDownloadDoesNotClobber) {
-  RegisterUser(kTestUser1);
+  login_manager_test_helper_->RegisterUser(kTestUser1);
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
@@ -550,7 +560,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
       GetDefaultImage(kFirstDefaultImageIndex);
 
   UserImageManagerImpl::IgnoreProfileDataDownloadDelayForTesting();
-  LoginUser(kTestUser1);
+  login_manager_test_helper_->LogInUser(kTestUser1);
 
   run_loop_.reset(new base::RunLoop);
   UserImageManager* user_image_manager =
@@ -652,7 +662,7 @@ class UserImageManagerPolicyTest : public UserImageManagerTest,
 };
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PRE_SetAndClear) {
-  RegisterUser(kTestUser1);
+  login_manager_test_helper_->RegisterUser(kTestUser1);
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
@@ -663,7 +673,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, SetAndClear) {
   const User* user = UserManager::Get()->FindUser(kTestUser1);
   ASSERT_TRUE(user);
 
-  LoginUser(kTestUser1);
+  login_manager_test_helper_->LogInUser(kTestUser1);
   base::RunLoop().RunUntilIdle();
 
   policy::CloudPolicyStore* store = GetStoreForUser(user);
@@ -738,7 +748,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, SetAndClear) {
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PRE_PolicyOverridesUser) {
-  RegisterUser(kTestUser1);
+  login_manager_test_helper_->RegisterUser(kTestUser1);
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
@@ -749,7 +759,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PolicyOverridesUser) {
   const User* user = UserManager::Get()->FindUser(kTestUser1);
   ASSERT_TRUE(user);
 
-  LoginUser(kTestUser1);
+  login_manager_test_helper_->LogInUser(kTestUser1);
   base::RunLoop().RunUntilIdle();
 
   policy::CloudPolicyStore* store = GetStoreForUser(user);
@@ -798,7 +808,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PolicyOverridesUser) {
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest,
                        PRE_UserDoesNotOverridePolicy) {
-  RegisterUser(kTestUser1);
+  login_manager_test_helper_->RegisterUser(kTestUser1);
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
@@ -809,7 +819,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, UserDoesNotOverridePolicy) {
   const User* user = UserManager::Get()->FindUser(kTestUser1);
   ASSERT_TRUE(user);
 
-  LoginUser(kTestUser1);
+  login_manager_test_helper_->LogInUser(kTestUser1);
   base::RunLoop().RunUntilIdle();
 
   policy::CloudPolicyStore* store = GetStoreForUser(user);