Componentize LoginManagerTest.

chrome/browser/chromeos/login/session_login_browsertest.cc

Index: chrome/browser/chromeos/login/session_login_browsertest.cc
diff --git a/chrome/browser/chromeos/login/session_login_browsertest.cc b/chrome/browser/chromeos/login/session_login_browsertest.cc
index 941485a947912d0af9b1bc3b2c0d58acde35b216..095aa9603f50650cbc3ef85e3203fd7250664548 100644
--- a/chrome/browser/chromeos/login/session_login_browsertest.cc
+++ b/chrome/browser/chromeos/login/session_login_browsertest.cc
@@ -4,7 +4,7 @@
 
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.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/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
@@ -12,6 +12,7 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/test/base/in_process_browser_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/view.h"
@@ -24,19 +25,38 @@ const char kTestUser[] = "test-user@gmail.com";
 
 }  // anonymous namespace
 
-class BrowserLoginTest : public chromeos::LoginManagerTest {
+class BrowserLoginTest : public InProcessBrowserTest {
  public:
-  BrowserLoginTest() : LoginManagerTest(true) {}
+  BrowserLoginTest()
+      : login_manager_test_helper_(new LoginManagerTestHelper(true)) {
+    set_exit_when_last_browser_closes(false);
+  }
+
   virtual ~BrowserLoginTest() {}
 
+  virtual void SetUpOnMainThread() OVERRIDE {
+    login_manager_test_helper_->SetUp();
+  }
+
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    LoginManagerTest::SetUpCommandLine(command_line);
+    login_manager_test_helper_->SetUpCommandLine(command_line);
     command_line->AppendSwitch(::switches::kCreateBrowserOnStartupForTests);
   }
+
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    login_manager_test_helper_->SetUpLoginUtils();
+  }
+
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    login_manager_test_helper_->CleanUp();
+  }
+
+ protected:
+  scoped_ptr<LoginManagerTestHelper> login_manager_test_helper_;
 };
 
 IN_PROC_BROWSER_TEST_F(BrowserLoginTest, PRE_BrowserActive) {
-  RegisterUser(kTestUser);
+  login_manager_test_helper_->RegisterUser(kTestUser);
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY,
             ash::Shell::GetInstance()->session_state_delegate()->
                 GetSessionState());
@@ -47,7 +67,7 @@ IN_PROC_BROWSER_TEST_F(BrowserLoginTest, BrowserActive) {
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY,
             ash::Shell::GetInstance()->session_state_delegate()->
                 GetSessionState());
-  LoginUser(kTestUser);
+  login_manager_test_helper_->LogInUser(kTestUser);
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
             ash::Shell::GetInstance()->session_state_delegate()->
                 GetSessionState());