Componentize LoginManagerTest.

chrome/browser/chromeos/login/reset_browsertest.cc

Index: chrome/browser/chromeos/login/reset_browsertest.cc
diff --git a/chrome/browser/chromeos/login/reset_browsertest.cc b/chrome/browser/chromeos/login/reset_browsertest.cc
index 045671cf61ae709a07dc007d037e6239d1026e3e..7080fe81db24e7f00fa6b5738c414852157beb03 100644
--- a/chrome/browser/chromeos/login/reset_browsertest.cc
+++ b/chrome/browser/chromeos/login/reset_browsertest.cc
@@ -7,13 +7,14 @@
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.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/oobe_display.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/webui_login_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.h"
@@ -30,15 +31,26 @@ const char kTestUser1[] = "test-user1@gmail.com";
 
 }  // namespace
 
-class ResetTest : public LoginManagerTest {
+class ResetTest : public InProcessBrowserTest {
  public:
-  ResetTest() : LoginManagerTest(false),
-      update_engine_client_(NULL),
-      session_manager_client_(NULL),
-      power_manager_client_(NULL) {
+  ResetTest()
+      : login_manager_test_helper_(new LoginManagerTestHelper(false)),
+        update_engine_client_(NULL),
+        session_manager_client_(NULL),
+        power_manager_client_(NULL) {
+    set_exit_when_last_browser_closes(false);
   }
+
   virtual ~ResetTest() {}
 
+  virtual void SetUpOnMainThread() OVERRIDE {
+    login_manager_test_helper_->SetUp();
+  }
+
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    login_manager_test_helper_->SetUpCommandLine(command_line);
+  }
+
   // LoginManagerTest overrides:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     FakeDBusThreadManager* dbus_manager = new FakeDBusThreadManager;
@@ -54,16 +66,21 @@ class ResetTest : public LoginManagerTest {
         scoped_ptr<UpdateEngineClient>(update_engine_client_));
     DBusThreadManager::SetInstanceForTesting(dbus_manager);
 
-    LoginManagerTest::SetUpInProcessBrowserTestFixture();
+    login_manager_test_helper_->SetUpLoginUtils();
+  }
+
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    login_manager_test_helper_->CleanUp();
   }
 
   void RegisterSomeUser() {
-    RegisterUser(kTestUser1);
+    login_manager_test_helper_->RegisterUser(kTestUser1);
     StartupUtils::MarkOobeCompleted();
   }
 
   bool JSExecuted(const std::string& script) {
-    return content::ExecuteScript(web_contents(), script);
+    return content::ExecuteScript(login_manager_test_helper_->web_contents(),
+                                  script);
   }
 
   void InvokeResetScreen() {
@@ -79,6 +96,7 @@ class ResetTest : public LoginManagerTest {
     ASSERT_TRUE(JSExecuted("$('reset-button').click();"));
   }
 
+  scoped_ptr<LoginManagerTestHelper> login_manager_test_helper_;
   FakeUpdateEngineClient* update_engine_client_;
   FakeSessionManagerClient* session_manager_client_;
   FakePowerManagerClient* power_manager_client_;
@@ -89,7 +107,7 @@ class ResetFirstAfterBootTest : public ResetTest {
   virtual ~ResetFirstAfterBootTest() {}
 
   virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
-    LoginManagerTest::SetUpCommandLine(command_line);
+    login_manager_test_helper_->SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kFirstExecAfterBoot);
   }
 };
@@ -99,12 +117,15 @@ IN_PROC_BROWSER_TEST_F(ResetTest, PRE_ShowAndCancel) {
 }
 
 IN_PROC_BROWSER_TEST_F(ResetTest, ShowAndCancel) {
-  JSExpect("!!document.querySelector('#reset.hidden')");
+  login_manager_test_helper_->JSExpect(
+      "!!document.querySelector('#reset.hidden')");
   EXPECT_EQ(0, update_engine_client_->can_rollback_call_count());
   InvokeResetScreen();
-  JSExpect("!document.querySelector('#reset.hidden')");
+  login_manager_test_helper_->JSExpect(
+      "!document.querySelector('#reset.hidden')");
   CloseResetScreen();
-  JSExpect("!!document.querySelector('#reset.hidden')");
+  login_manager_test_helper_->JSExpect(
+      "!!document.querySelector('#reset.hidden')");
   EXPECT_EQ(1, update_engine_client_->can_rollback_call_count());
 }
 
@@ -138,7 +159,7 @@ IN_PROC_BROWSER_TEST_F(ResetTest, RestartBeforeRollback) {
   EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
   EXPECT_EQ(0, session_manager_client_->start_device_wipe_call_count());
   ASSERT_TRUE(content::ExecuteScript(
-      web_contents(),
+      login_manager_test_helper_->web_contents(),
       "$('reset-rollback-checkbox').checked = true;"));
   ClickResetButton();
   ASSERT_EQ(1, power_manager_client_->num_request_restart_calls());
@@ -180,7 +201,7 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ShortcutInvokedCases) {
   // rollback available and checked
   InvokeResetScreen();
   ASSERT_TRUE(content::ExecuteScript(
-      web_contents(),
+      login_manager_test_helper_->web_contents(),
       "$('reset-rollback-checkbox').checked = true;"));
   ClickResetButton();
   EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());