Componentize LoginManagerTest.

chrome/browser/chromeos/preferences_browsertest.cc

Index: chrome/browser/chromeos/preferences_browsertest.cc
diff --git a/chrome/browser/chromeos/preferences_browsertest.cc b/chrome/browser/chromeos/preferences_browsertest.cc
index 223a0812821f3b1bf4bcfbc953e7a5fa65d3a9dd..28ceea3d6f8116c25abaeec83e58d9683a3f6a5a 100644
--- a/chrome/browser/chromeos/preferences_browsertest.cc
+++ b/chrome/browser/chromeos/preferences_browsertest.cc
@@ -10,7 +10,7 @@
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager_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_adding_screen.h"
 #include "chrome/browser/chromeos/preferences.h"
@@ -21,6 +21,7 @@
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/ime/fake_ime_keyboard.h"
 #include "content/public/test/test_utils.h"
@@ -35,21 +36,23 @@ const char* kTestUsers[] = {"test-user1@gmail.com", "test-user2@gmail.com"};
 
 }  // namespace
 
-class PreferencesTest : public LoginManagerTest {
+class PreferencesTest : public InProcessBrowserTest {
  public:
   PreferencesTest()
-      : LoginManagerTest(true),
+      : login_manager_test_helper_(new LoginManagerTestHelper(true)),
         input_settings_(NULL),
-        keyboard_(NULL) {}
+        keyboard_(NULL) {
+    set_exit_when_last_browser_closes(false);
+  }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    LoginManagerTest::SetUpCommandLine(command_line);
+    login_manager_test_helper_->SetUpCommandLine(command_line);
     command_line->AppendSwitch(::switches::kMultiProfiles);
     command_line->AppendSwitch(switches::kStubCrosSettings);
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    LoginManagerTest::SetUpOnMainThread();
+    login_manager_test_helper_->SetUp();
     input_settings_ = new system::FakeInputDeviceSettings();
     system::InputDeviceSettings::SetSettingsForTesting(input_settings_);
     keyboard_ = new input_method::FakeImeKeyboard();
@@ -59,6 +62,14 @@ class PreferencesTest : public LoginManagerTest {
     CrosSettings::Get()->SetString(kDeviceOwner, kTestUsers[0]);
   }
 
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    login_manager_test_helper_->SetUpLoginUtils();
+  }
+
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    login_manager_test_helper_->CleanUp();
+  }
+
   // Sets set of preferences in given |prefs|. Value of prefernece depends of
   // |variant| value. For opposite |variant| values all preferences receive
   // different values.
@@ -125,6 +136,9 @@ class PreferencesTest : public LoginManagerTest {
         chrome::MultiUserWindowManagerChromeOS::ANIMATION_SPEED_DISABLED);
   }
 
+ protected:
+  scoped_ptr<LoginManagerTestHelper> login_manager_test_helper_;
+
  private:
   system::FakeInputDeviceSettings* input_settings_;
   input_method::FakeImeKeyboard* keyboard_;
@@ -133,8 +147,8 @@ class PreferencesTest : public LoginManagerTest {
 };
 
 IN_PROC_BROWSER_TEST_F(PreferencesTest, PRE_MultiProfiles) {
-  RegisterUser(kTestUsers[0]);
-  RegisterUser(kTestUsers[1]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[0]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[1]);
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
@@ -143,7 +157,7 @@ IN_PROC_BROWSER_TEST_F(PreferencesTest, MultiProfiles) {
 
   // Add first user and init its preferences. Check that corresponding
   // settings has been changed.
-  LoginUser(kTestUsers[0]);
+  login_manager_test_helper_->LogInUser(kTestUsers[0]);
   const User* user1 = user_manager->FindUser(kTestUsers[0]);
   PrefService* prefs1 = user_manager->GetProfileByUser(user1)->GetPrefs();
   SetPrefs(prefs1, false);
@@ -154,7 +168,7 @@ IN_PROC_BROWSER_TEST_F(PreferencesTest, MultiProfiles) {
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
   DisableAnimations();
-  AddUser(kTestUsers[1]);
+  login_manager_test_helper_->AddUser(kTestUsers[1]);
   content::RunAllPendingInMessageLoop();
   const User* user2 = user_manager->FindUser(kTestUsers[1]);
   EXPECT_TRUE(user2->is_active());