Componentize LoginManagerTest.

chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc

Index: chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc
index 93ef37732e12a5dc1ed422a15cce6a4c14a07403..e240220646052f21fe7e04a2624839db2b0045e8 100644
--- a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc
+++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc
@@ -5,7 +5,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.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/login/user_manager.h"
@@ -15,6 +15,7 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "content/public/browser/web_contents.h"
@@ -29,11 +30,12 @@ const char* kTestUsers[] = { "test-user1@gmail.com", "test-user2@gmail.com" };
 
 }  // namespace
 
-class AccountsOptionsTest : public LoginManagerTest {
+class AccountsOptionsTest : public InProcessBrowserTest {
  public:
   AccountsOptionsTest()
-    : LoginManagerTest(false),
-      device_settings_provider_(NULL) {
+      : login_manager_test_helper_(new LoginManagerTestHelper(false)),
+        device_settings_provider_(NULL) {
+    set_exit_when_last_browser_closes(false);
     stub_settings_provider_.Set(kDeviceOwner, base::StringValue(kTestUsers[0]));
   }
 
@@ -41,7 +43,7 @@ class AccountsOptionsTest : public LoginManagerTest {
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    LoginManagerTest::SetUpOnMainThread();
+    login_manager_test_helper_->SetUp();
     CrosSettings* settings = CrosSettings::Get();
     device_settings_provider_ = settings->GetProvider(kDeviceOwner);
     settings->RemoveSettingsProvider(device_settings_provider_);
@@ -52,14 +54,18 @@ class AccountsOptionsTest : public LoginManagerTest {
     CrosSettings* settings = CrosSettings::Get();
     settings->RemoveSettingsProvider(&stub_settings_provider_);
     settings->AddSettingsProvider(device_settings_provider_);
-    LoginManagerTest::CleanUpOnMainThread();
+    login_manager_test_helper_->CleanUp();
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    LoginManagerTest::SetUpCommandLine(command_line);
+    login_manager_test_helper_->SetUpCommandLine(command_line);
   }
 
- protected:
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    login_manager_test_helper_->SetUpLoginUtils();
+  }
+
+protected:

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

add back space

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

Done.

   void CheckAccountsUI(const User* user, bool is_owner) {
     Profile* profile = UserManager::Get()->GetProfileByUser(user);
     profile->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
@@ -108,6 +114,7 @@ class AccountsOptionsTest : public LoginManagerTest {
     EXPECT_EQ(is_owner, whitelist_enabled);
   }
 
+  scoped_ptr<LoginManagerTestHelper> login_manager_test_helper_;
   StubCrosSettingsProvider stub_settings_provider_;
   CrosSettingsProvider* device_settings_provider_;
 
@@ -116,18 +123,18 @@ class AccountsOptionsTest : public LoginManagerTest {
 };
 
 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, PRE_MultiProfilesAccountsOptions) {
-  RegisterUser(kTestUsers[0]);
-  RegisterUser(kTestUsers[1]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[0]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[1]);
   StartupUtils::MarkOobeCompleted();
 }
 
 // TODO(pastarmovj): Enable this test once https://crbug.com/362430 is fixed.
 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest,
                        DISABLED_MultiProfilesAccountsOptions) {
-  LoginUser(kTestUsers[0]);
+  login_manager_test_helper_->LogInUser(kTestUsers[0]);
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
-  AddUser(kTestUsers[1]);
+  login_manager_test_helper_->AddUser(kTestUsers[1]);
 
   UserManager* manager = UserManager::Get();
   ASSERT_EQ(2u, manager->GetLoggedInUsers().size());