Componentize LoginManagerTest.

chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc

 // Copyright 2014 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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.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_adding_screen.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 
 namespace chromeos {
 
 namespace {
 
 const char* kTestUsers[] = { "test-user1@gmail.com", "test-user2@gmail.com" };
 
 }  // namespace
 
-class AccountsOptionsTest : public LoginManagerTest {
+class AccountsOptionsTest : public InProcessBrowserTest {
  public:
   AccountsOptionsTest()
-    : LoginManagerTest(false),
-      device_settings_provider_(NULL) {
+      : login_manager_test_helper_(new LoginManagerTestHelper(false)),
+        device_settings_provider_(NULL) {
+    set_exit_when_last_browser_closes(false);
     stub_settings_provider_.Set(kDeviceOwner, base::StringValue(kTestUsers[0]));
   }
 
   virtual ~AccountsOptionsTest() {
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    LoginManagerTest::SetUpOnMainThread();
+    login_manager_test_helper_->SetUp();
     CrosSettings* settings = CrosSettings::Get();
     device_settings_provider_ = settings->GetProvider(kDeviceOwner);
     settings->RemoveSettingsProvider(device_settings_provider_);
     settings->AddSettingsProvider(&stub_settings_provider_);
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     CrosSettings* settings = CrosSettings::Get();
     settings->RemoveSettingsProvider(&stub_settings_provider_);
     settings->AddSettingsProvider(device_settings_provider_);
-    LoginManagerTest::CleanUpOnMainThread();
+    login_manager_test_helper_->CleanUp();
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    LoginManagerTest::SetUpCommandLine(command_line);
+    login_manager_test_helper_->SetUpCommandLine(command_line);
   }
 
- protected:
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    login_manager_test_helper_->SetUpLoginUtils();
+  }
+
+protected:

[michaelpg, 2014/05/07 00:55:05]

add back space

[michaelpg, 2014/05/07 02:48:24]

Done.

   void CheckAccountsUI(const User* user, bool is_owner) {
     Profile* profile = UserManager::Get()->GetProfileByUser(user);
     profile->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
                                    user->email());
 
     ui_test_utils::BrowserAddedObserver observer;
     Browser* browser = CreateBrowser(profile);
     observer.WaitForSingleNewBrowser();
 
     ui_test_utils::NavigateToURL(browser,
@@ skipping 28 matching lines @@
 
     bool whitelist_enabled;
     ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
         contents,
         "var e = document.getElementById('useWhitelistCheck');"
         "window.domAutomationController.send(!e.disabled);",
         &whitelist_enabled));
     EXPECT_EQ(is_owner, whitelist_enabled);
   }
 
+  scoped_ptr<LoginManagerTestHelper> login_manager_test_helper_;
   StubCrosSettingsProvider stub_settings_provider_;
   CrosSettingsProvider* device_settings_provider_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AccountsOptionsTest);
 };
 
 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, PRE_MultiProfilesAccountsOptions) {
-  RegisterUser(kTestUsers[0]);
-  RegisterUser(kTestUsers[1]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[0]);
+  login_manager_test_helper_->RegisterUser(kTestUsers[1]);
   StartupUtils::MarkOobeCompleted();
 }
 
 // TODO(pastarmovj): Enable this test once https://crbug.com/362430 is fixed.
 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest,
                        DISABLED_MultiProfilesAccountsOptions) {
-  LoginUser(kTestUsers[0]);
+  login_manager_test_helper_->LogInUser(kTestUsers[0]);
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
-  AddUser(kTestUsers[1]);
+  login_manager_test_helper_->AddUser(kTestUsers[1]);
 
   UserManager* manager = UserManager::Get();
   ASSERT_EQ(2u, manager->GetLoggedInUsers().size());
 
   CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */);
   CheckAccountsUI(manager->FindUser(kTestUsers[1]), false /* is_owner */);
 }
 
 }  // namespace chromeos