Componentize LoginManagerTest.

chrome/browser/net/nss_context_chromeos_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/nss_context.h"
 
 #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"
 
 namespace {
 
 const char kTestUser1[] = "test-user1@gmail.com";
 const char kTestUser2[] = "test-user2@gmail.com";
 
 void NotCalledDbCallback(net::NSSCertDatabase* db) { ASSERT_TRUE(false); }
 
@@ skipping 84 matching lines @@
     content::BrowserThread::PostTask(
         content::BrowserThread::UI, FROM_HERE, done_callback);
   }
 
   Profile* profile_;
   net::NSSCertDatabase* db_;
 };
 
 }  // namespace
 
-class NSSContextChromeOSBrowserTest : public chromeos::LoginManagerTest {
+class NSSContextChromeOSBrowserTest : public InProcessBrowserTest {
  public:
   NSSContextChromeOSBrowserTest()
-      : LoginManagerTest(true /* should_launch_browser */) {}
+      : login_manager_test_helper_(new chromeos::LoginManagerTestHelper) {
+    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(true);
+  }
+
+  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();
 }
 
 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);
 
   DBTester tester1(profile1);
   ASSERT_TRUE(tester1.DoGetDBTests());
 
   // 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));
   ASSERT_TRUE(profile2);
 
   DBTester tester2(profile2);
   ASSERT_TRUE(tester2.DoGetDBTests());
 
   // Get both DBs again to check that the same object is returned.
   tester1.DoGetDBAgainTests();
   tester2.DoGetDBAgainTests();
 
   // Check that each user has a separate DB and NSS slots.
   tester1.DoNotEqualsTests(&tester2);
 }