Componentize LoginManagerTest.

chrome/browser/chromeos/login/login_ui_browsertest.cc

Index: chrome/browser/chromeos/login/login_ui_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_ui_browsertest.cc b/chrome/browser/chromeos/login/login_ui_browsertest.cc
index 4f545ed00681ad34b67e7ec3bb894d7bf469e614..7ae9ca9cb895232d292b0d72961cae51c3a02170 100644
--- a/chrome/browser/chromeos/login/login_ui_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_ui_browsertest.cc
@@ -4,10 +4,11 @@
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.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/test/oobe_screen_waiter.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/test/base/in_process_browser_test.h"
 
 namespace chromeos {
 
@@ -18,29 +19,55 @@ const char kTestUser2[] = "test-user2@gmail.com";
 
 }  // anonymous namespace
 
-class LoginUITest : public chromeos::LoginManagerTest {
+class LoginUITest : public InProcessBrowserTest {
  public:
-  LoginUITest() : LoginManagerTest(false) {}
+  LoginUITest() : login_manager_test_helper_(new LoginManagerTestHelper) {
+    set_exit_when_last_browser_closes(false);
+  }
+
   virtual ~LoginUITest() {}
+
+  virtual void SetUpOnMainThread() OVERRIDE {
+    login_manager_test_helper_->SetUp();
+  }
+
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    login_manager_test_helper_->SetUpCommandLine(command_line);
+  }
+
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    login_manager_test_helper_->SetUpLoginUtils(false);
+  }
+
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    login_manager_test_helper_->CleanUp();
+  }
+
+ protected:
+  scoped_ptr<LoginManagerTestHelper> login_manager_test_helper_;
 };
 
 IN_PROC_BROWSER_TEST_F(LoginUITest, PRE_LoginUIVisible) {
-  RegisterUser(kTestUser1);
-  RegisterUser(kTestUser2);
+  login_manager_test_helper_->RegisterUser(kTestUser1);
+  login_manager_test_helper_->RegisterUser(kTestUser2);
   StartupUtils::MarkOobeCompleted();
 }
 
 // Verifies basic login UI properties.
 IN_PROC_BROWSER_TEST_F(LoginUITest, LoginUIVisible) {
-  JSExpect("!!document.querySelector('#account-picker')");
-  JSExpect("!!document.querySelector('#pod-row')");
-  JSExpect(
+  login_manager_test_helper_->JSExpect(
+      "!!document.querySelector('#account-picker')");
+  login_manager_test_helper_->JSExpect(
+      "!!document.querySelector('#pod-row')");
+  login_manager_test_helper_->JSExpect(
       "document.querySelectorAll('.pod:not(#user-pod-template)').length == 2");
 
-  JSExpect("document.querySelectorAll('.pod:not(#user-pod-template)')[0]"
-           ".user.emailAddress == '" + std::string(kTestUser1) + "'");
-  JSExpect("document.querySelectorAll('.pod:not(#user-pod-template)')[1]"
-           ".user.emailAddress == '" + std::string(kTestUser2) + "'");
+  login_manager_test_helper_->JSExpect(
+      "document.querySelectorAll('.pod:not(#user-pod-template)')[0]"
+      ".user.emailAddress == '" + std::string(kTestUser1) + "'");
+  login_manager_test_helper_->JSExpect(
+      "document.querySelectorAll('.pod:not(#user-pod-template)')[1]"
+      ".user.emailAddress == '" + std::string(kTestUser2) + "'");
 }
 
 IN_PROC_BROWSER_TEST_F(LoginUITest, PRE_InterruptedAutoStartEnrollment) {