Componentize LoginManagerTest.

chrome/browser/net/nss_context_chromeos_browsertest.cc

Index: chrome/browser/net/nss_context_chromeos_browsertest.cc
diff --git a/chrome/browser/net/nss_context_chromeos_browsertest.cc b/chrome/browser/net/nss_context_chromeos_browsertest.cc
index 3f4b6591ea602aaa452792542ea6b159444220a5..b502e62fafe4df7f26094f1d245646a7aceaecd1 100644
--- a/chrome/browser/net/nss_context_chromeos_browsertest.cc
+++ b/chrome/browser/net/nss_context_chromeos_browsertest.cc
@@ -6,11 +6,12 @@
 
 #include "base/bind.h"
 #include "base/run_loop.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.h"
 #include "chrome/browser/chromeos/login/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/cert/nss_cert_database.h"
 
@@ -115,17 +116,39 @@ class DBTester {
 
 }  // namespace
 
-class NSSContextChromeOSBrowserTest : public chromeos::LoginManagerTest {
+class NSSContextChromeOSBrowserTest : public InProcessBrowserTest {
  public:
   NSSContextChromeOSBrowserTest()
-      : LoginManagerTest(true /* should_launch_browser */) {}
+      : login_manager_test_helper_(new chromeos::LoginManagerTestHelper(true)) {
+    set_exit_when_last_browser_closes(false);
+  }
+
   virtual ~NSSContextChromeOSBrowserTest() {}
+
+  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();
+  }
+
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    login_manager_test_helper_->CleanUp();
+  }
+
+ protected:
+  scoped_ptr<chromeos::LoginManagerTestHelper> login_manager_test_helper_;
 };
 
 IN_PROC_BROWSER_TEST_F(NSSContextChromeOSBrowserTest, PRE_TwoUsers) {
   // Initialization for ChromeOS multi-profile test infrastructure.
-  RegisterUser(kTestUser1);
-  RegisterUser(kTestUser2);
+  login_manager_test_helper_->RegisterUser(kTestUser1);
+  login_manager_test_helper_->RegisterUser(kTestUser2);
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
@@ -133,7 +156,7 @@ IN_PROC_BROWSER_TEST_F(NSSContextChromeOSBrowserTest, TwoUsers) {
   chromeos::UserManager* user_manager = chromeos::UserManager::Get();
 
   // Log in first user and get their DB.
-  LoginUser(kTestUser1);
+  login_manager_test_helper_->LogInUser(kTestUser1);
   Profile* profile1 =
       user_manager->GetProfileByUser(user_manager->FindUser(kTestUser1));
   ASSERT_TRUE(profile1);
@@ -144,7 +167,7 @@ IN_PROC_BROWSER_TEST_F(NSSContextChromeOSBrowserTest, TwoUsers) {
   // Log in second user and get their DB.
   chromeos::UserAddingScreen::Get()->Start();
   base::RunLoop().RunUntilIdle();
-  AddUser(kTestUser2);
+  login_manager_test_helper_->AddUser(kTestUser2);
 
   Profile* profile2 =
       user_manager->GetProfileByUser(user_manager->FindUser(kTestUser2));