Componentize LoginManagerTest.

chrome/browser/chromeos/login/user_adding_screen_browsertest.cc

Index: chrome/browser/chromeos/login/user_adding_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc b/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc
index 0bdb21af211cd58373bf11c381f38d0f0c90e2e9..b500a2683952c29506856cb3ce7b8b88fac7ee43 100644
--- a/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc
@@ -6,7 +6,7 @@
 #include "ash/shell.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/login/login_display_host_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/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/user_adding_screen.h"
@@ -29,24 +29,34 @@ const char* kTestUsers[] = {"test-user1@gmail.com",
 
 namespace chromeos {
 
-class UserAddingScreenTest : public LoginManagerTest,
+class UserAddingScreenTest : public InProcessBrowserTest,
                              public UserAddingScreen::Observer {
  public:
-  UserAddingScreenTest() : LoginManagerTest(false),
-                           user_adding_started_(0),
-                           user_adding_finished_(0) {
+  UserAddingScreenTest()
+      : login_manager_test_helper_(new LoginManagerTestHelper),
+        user_adding_started_(0),
+        user_adding_finished_(0) {
+    set_exit_when_last_browser_closes(false);
+  }
+
+  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::kMultiProfiles);
   }
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    LoginManagerTest::SetUpInProcessBrowserTestFixture();
+    login_manager_test_helper_->SetUpLoginUtils(false);
     UserAddingScreen::Get()->AddObserver(this);
   }
 
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    login_manager_test_helper_->CleanUp();
+  }
+
   virtual void OnUserAddingFinished() OVERRIDE { ++user_adding_finished_; }
 
   virtual void OnUserAddingStarted() OVERRIDE { ++user_adding_started_; }
@@ -59,6 +69,9 @@ class UserAddingScreenTest : public LoginManagerTest,
 
   int user_adding_finished() { return user_adding_finished_; }
 
+ protected:
+  scoped_ptr<LoginManagerTestHelper> login_manager_test_helper_;
+
  private:
   int user_adding_started_;
   int user_adding_finished_;
@@ -67,14 +80,15 @@ class UserAddingScreenTest : public LoginManagerTest,
 };
 
 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, PRE_CancelAdding) {
-  RegisterUser(kTestUsers[0]);
-  RegisterUser(kTestUsers[1]);
-  RegisterUser(kTestUsers[2]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[0]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[1]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[2]);
   StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, CancelAdding) {
-  EXPECT_CALL(login_utils(), DoBrowserLaunch(_, _)).Times(1);
+  EXPECT_CALL(login_manager_test_helper_->login_utils(),
+              DoBrowserLaunch(_, _)).Times(1);
   EXPECT_EQ(3u, UserManager::Get()->GetUsers().size());
   EXPECT_EQ(0u, UserManager::Get()->GetLoggedInUsers().size());
 
@@ -82,7 +96,7 @@ IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, CancelAdding) {
             ash::Shell::GetInstance()->session_state_delegate()->
                 GetSessionState());
 
-  LoginUser(kTestUsers[0]);
+  login_manager_test_helper_->LogInUser(kTestUsers[0]);
   EXPECT_EQ(1u, UserManager::Get()->GetLoggedInUsers().size());
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
             ash::Shell::GetInstance()->session_state_delegate()->
@@ -108,9 +122,9 @@ IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, CancelAdding) {
 }
 
 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, PRE_AddingSeveralUsers) {
-  RegisterUser(kTestUsers[0]);
-  RegisterUser(kTestUsers[1]);
-  RegisterUser(kTestUsers[2]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[0]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[1]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[2]);
   StartupUtils::MarkOobeCompleted();
 }
 
@@ -118,8 +132,9 @@ IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, AddingSeveralUsers) {
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY,
             ash::Shell::GetInstance()->session_state_delegate()->
                 GetSessionState());
-  EXPECT_CALL(login_utils(), DoBrowserLaunch(_, _)).Times(3);
-  LoginUser(kTestUsers[0]);
+  EXPECT_CALL(login_manager_test_helper_->login_utils(),
+              DoBrowserLaunch(_, _)).Times(3);
+  login_manager_test_helper_->LogInUser(kTestUsers[0]);
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
             ash::Shell::GetInstance()->session_state_delegate()->
                 GetSessionState());
@@ -133,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, AddingSeveralUsers) {
     EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY,
               ash::Shell::GetInstance()->session_state_delegate()->
                   GetSessionState());
-    AddUser(kTestUsers[i]);
+    login_manager_test_helper_->AddUser(kTestUsers[i]);
     EXPECT_EQ(i, user_adding_finished());
     EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
               ash::Shell::GetInstance()->session_state_delegate()->