Componentize LoginManagerTest.

chrome/browser/chromeos/login/managed/managed_user_test_base.cc

Index: chrome/browser/chromeos/login/managed/managed_user_test_base.cc
diff --git a/chrome/browser/chromeos/login/managed/managed_user_test_base.cc b/chrome/browser/chromeos/login/managed/managed_user_test_base.cc
index 05cdc7a90c865b9ee408a41be780f5fca544dc29..a6196f8a83507bc193443e554730832e61d6094f 100644
--- a/chrome/browser/chromeos/login/managed/managed_user_test_base.cc
+++ b/chrome/browser/chromeos/login/managed/managed_user_test_base.cc
@@ -14,7 +14,6 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chrome_notification_types.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/managed/supervised_user_authentication.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/supervised_user_manager.h"
@@ -160,18 +159,27 @@ void ManagedUsersSharedSettingsSyncTestAdapter::AddChange(
 }
 
 ManagedUserTestBase::ManagedUserTestBase()
-    : LoginManagerTest(true),
-      mock_async_method_caller_(NULL),
+    : mock_async_method_caller_(NULL),
       mock_homedir_methods_(NULL),
       network_portal_detector_(NULL),
-      registration_utility_stub_(NULL) {
+      registration_utility_stub_(NULL),
+      login_manager_test_helper_(new LoginManagerTestHelper(true)) {
+  set_exit_when_last_browser_closes(false);
 }
 
 ManagedUserTestBase::~ManagedUserTestBase() {
 }
 
+void ManagedUserTestBase::SetUpOnMainThread() {
+  login_manager_test_helper_->SetUp();
+}
+
+void ManagedUserTestBase::SetUpCommandLine(CommandLine* command_line) {
+  login_manager_test_helper_->SetUpCommandLine(command_line);
+}
+
 void ManagedUserTestBase::SetUpInProcessBrowserTestFixture() {
-  LoginManagerTest::SetUpInProcessBrowserTestFixture();
+  login_manager_test_helper_->SetUpLoginUtils();
   mock_async_method_caller_ = new cryptohome::MockAsyncMethodCaller;
   mock_async_method_caller_->SetUp(true, cryptohome::MOUNT_ERROR_NONE);
   cryptohome::AsyncMethodCaller::InitializeForTesting(
@@ -200,7 +208,7 @@ void ManagedUserTestBase::SetUpInProcessBrowserTestFixture() {
 }
 
 void ManagedUserTestBase::CleanUpOnMainThread() {
-  LoginManagerTest::CleanUpOnMainThread();
+  login_manager_test_helper_->CleanUp();
 }
 
 void ManagedUserTestBase::TearDown() {
@@ -208,7 +216,7 @@ void ManagedUserTestBase::TearDown() {
   cryptohome::HomedirMethods::Shutdown();
   mock_homedir_methods_ = NULL;
   mock_async_method_caller_ = NULL;
-  LoginManagerTest::TearDown();
+  InProcessBrowserTest::TearDown();
 }
 
 void ManagedUserTestBase::TearDownInProcessBrowserTestFixture() {
@@ -216,13 +224,14 @@ void ManagedUserTestBase::TearDownInProcessBrowserTestFixture() {
 }
 
 void ManagedUserTestBase::JSEval(const std::string& script) {
-  EXPECT_TRUE(content::ExecuteScript(web_contents(), script));
+  EXPECT_TRUE(content::ExecuteScript(login_manager_test_helper_->web_contents(),
+                                     script));
 }
 
 void ManagedUserTestBase::JSExpectAsync(const std::string& function) {
   bool result;
   EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
-      web_contents(),
+      login_manager_test_helper_->web_contents(),
       StringPrintf(
           "(%s)(function() { window.domAutomationController.send(true); });",
           function.c_str()),
@@ -240,8 +249,8 @@ void ManagedUserTestBase::JSSetTextField(const std::string& element_selector,
 }
 
 void ManagedUserTestBase::PrepareUsers() {
-  RegisterUser(kTestManager);
-  RegisterUser(kTestOtherUser);
+  login_manager_test_helper_->RegisterUser(kTestManager);
+  login_manager_test_helper_->RegisterUser(kTestOtherUser);
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
@@ -250,13 +259,15 @@ void ManagedUserTestBase::StartFlowLoginAsManager() {
   JSEval("chrome.send('showLocallyManagedUserCreationScreen')");
 
   // Read intro and proceed.
-  JSExpect(StringPrintf("%s == 'intro'", kCurrentPage));
+  login_manager_test_helper_->JSExpect(
+      StringPrintf("%s == 'intro'", kCurrentPage));
 
   JSEval("$('managed-user-creation-start-button').click()");
 
   // Check that both users appear as managers, and test-manager@gmail.com is
   // the first one.
-  JSExpect(StringPrintf("%s == 'manager'", kCurrentPage));
+  login_manager_test_helper_->JSExpect(
+      StringPrintf("%s == 'manager'", kCurrentPage));
 
   std::string manager_pods =
       "document.querySelectorAll('#managed-user-creation-managers-pane "
@@ -267,28 +278,33 @@ void ManagedUserTestBase::StartFlowLoginAsManager() {
 
   int managers_on_device = 2;
 
-  JSExpect(StringPrintf("%s.length == 1", selected_manager_pods.c_str()));
+  login_manager_test_helper_->JSExpect(
+      StringPrintf("%s.length == 1", selected_manager_pods.c_str()));
 
-  JSExpect(
+  login_manager_test_helper_->JSExpect(
       StringPrintf("$('managed-user-creation').managerList_.pods.length == %d",
                    managers_on_device));
-  JSExpect(StringPrintf(
+  login_manager_test_helper_->JSExpect(StringPrintf(
       "%s.length == %d", manager_pods.c_str(), managers_on_device));
-  JSExpect(StringPrintf("%s[%d].user.emailAddress == '%s'",
-                        manager_pods.c_str(),
-                        0,
-                        kTestManager));
+  login_manager_test_helper_->JSExpect(
+      StringPrintf("%s[%d].user.emailAddress == '%s'",
+                   manager_pods.c_str(),
+                   0,
+                   kTestManager));
 
   // Select the first user as manager, and enter password.
-  JSExpect("$('managed-user-creation-next-button').disabled");
+  login_manager_test_helper_->JSExpect(
+      "$('managed-user-creation-next-button').disabled");
   JSSetTextField("#managed-user-creation .manager-pod.focused input",
                  kTestManagerPassword);
 
   JSEval("$('managed-user-creation').updateNextButtonForManager_()");
 
   // Next button is now enabled.
-  JSExpect("!$('managed-user-creation-next-button').disabled");
-  SetExpectedCredentials(kTestManager, kTestManagerPassword);
+  login_manager_test_helper_->JSExpect(
+      "!$('managed-user-creation-next-button').disabled");
+  login_manager_test_helper_->SetExpectedCredentials(kTestManager,
+                                                     kTestManagerPassword);
   content::WindowedNotificationObserver login_observer(
       chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
       content::NotificationService::AllSources());
@@ -303,11 +319,13 @@ void ManagedUserTestBase::StartFlowLoginAsManager() {
   base::RunLoop().RunUntilIdle();
 
   // Check the page have changed.
-  JSExpect(StringPrintf("%s == 'username'", kCurrentPage));
+  login_manager_test_helper_->JSExpect(
+      StringPrintf("%s == 'username'", kCurrentPage));
 }
 
 void ManagedUserTestBase::FillNewUserData(const std::string& display_name) {
-  JSExpect("$('managed-user-creation-next-button').disabled");
+  login_manager_test_helper_->JSExpect(
+      "$('managed-user-creation-next-button').disabled");
   JSSetTextField("#managed-user-creation-name", display_name);
   JSEval("$('managed-user-creation').checkUserName_()");
 
@@ -319,7 +337,8 @@ void ManagedUserTestBase::FillNewUserData(const std::string& display_name) {
                  kTestSupervisedUserPassword);
 
   JSEval("$('managed-user-creation').updateNextButtonForUser_()");
-  JSExpect("!$('managed-user-creation-next-button').disabled");
+  login_manager_test_helper_->JSExpect(
+      "!$('managed-user-creation-next-button').disabled");
 }
 
 void ManagedUserTestBase::StartUserCreation(
@@ -343,7 +362,8 @@ void ManagedUserTestBase::StartUserCreation(
   content::BrowserThread::GetBlockingPool()->FlushForTesting();
   base::RunLoop().RunUntilIdle();
 
-  JSExpect(StringPrintf("%s == 'created'", kCurrentPage));
+  login_manager_test_helper_->JSExpect(
+      StringPrintf("%s == 'created'", kCurrentPage));
   JSEval("$('managed-user-creation-gotit-button').click()");
 }
 
@@ -360,7 +380,7 @@ void ManagedUserTestBase::SigninAsSupervisedUser(
   // Created supervised user have to be first in a list.
   const User* user = UserManager::Get()->GetUsers().at(user_index);
   ASSERT_EQ(base::UTF8ToUTF16(expected_display_name), user->display_name());
-  LoginUser(user->email());
+  login_manager_test_helper_->LogInUser(user->email());
   if (check_homedir_calls)
     ::testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_);
   Profile* profile = UserManager::Get()->GetProfileByUser(user);
@@ -374,7 +394,7 @@ void ManagedUserTestBase::SigninAsManager(int user_index) {
 
   // Created supervised user have to be first in a list.
   const User* user = UserManager::Get()->GetUsers().at(user_index);
-  LoginUser(user->email());
+  login_manager_test_helper_->LogInUser(user->email());
   Profile* profile = UserManager::Get()->GetProfileByUser(user);
   shared_settings_adapter_.reset(
       new ManagedUsersSharedSettingsSyncTestAdapter(profile));
@@ -393,22 +413,22 @@ void ManagedUserTestBase::RemoveSupervisedUser(
   ASSERT_EQ(base::UTF8ToUTF16(expected_display_name), user->display_name());
 
   // Open pod menu.
-  JSExpect(
+  login_manager_test_helper_->JSExpect(
       StringPrintf("!$('pod-row').pods[%d].isActionBoxMenuActive", user_index));
   JSEval(StringPrintf(
       "$('pod-row').pods[%d].querySelector('.action-box-button').click()",
       user_index));
-  JSExpect(
+  login_manager_test_helper_->JSExpect(
       StringPrintf("$('pod-row').pods[%d].isActionBoxMenuActive", user_index));
 
   // Select "Remove user" element.
-  JSExpect(StringPrintf(
+  login_manager_test_helper_->JSExpect(StringPrintf(
       "$('pod-row').pods[%d].actionBoxRemoveUserWarningElement.hidden",
       user_index));
   JSEval(StringPrintf(
       "$('pod-row').pods[%d].querySelector('.action-box-menu-remove').click()",
       user_index));
-  JSExpect(StringPrintf(
+  login_manager_test_helper_->JSExpect(StringPrintf(
       "!$('pod-row').pods[%d].actionBoxRemoveUserWarningElement.hidden",
       user_index));