Componentize LoginManagerTest.

chrome/browser/chromeos/login/login_manager_test_helper.h

Index: chrome/browser/chromeos/login/login_manager_test_helper.h
diff --git a/chrome/browser/chromeos/login/login_manager_test.h b/chrome/browser/chromeos/login/login_manager_test_helper.h
similarity index 62%
copy from chrome/browser/chromeos/login/login_manager_test.h
copy to chrome/browser/chromeos/login/login_manager_test_helper.h
index b05db4860117f540bd8352dd53724d9c9200b554..e66085e6d23851802aa3a375b356e63d864c861e 100644
--- a/chrome/browser/chromeos/login/login_manager_test.h
+++ b/chrome/browser/chromeos/login/login_manager_test_helper.h
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_MANAGER_TEST_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_MANAGER_TEST_H_
+#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_MANAGER_TEST_HELPER_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_MANAGER_TEST_HELPER_H_
 
 #include "chrome/browser/chromeos/login/mock_login_utils.h"
 #include "chrome/browser/chromeos/login/test/js_checker.h"
-#include "chrome/test/base/in_process_browser_test.h"
 
 namespace content {
 class WebContents;
@@ -15,21 +14,20 @@ class WebContents;
 
 namespace chromeos {
 
-// Base class for Chrome OS out-of-box/login WebUI tests.
+// Helper class for Chrome OS out-of-box/login WebUI tests.
 // If no special configuration is done launches out-of-box WebUI.
 // To launch login UI use PRE_* test that will register user(s) and mark
 // out-of-box as completed.
-// Guarantees that WebUI has been initialized by waiting for
-// NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE notification.
-class LoginManagerTest : public InProcessBrowserTest {
+class LoginManagerTestHelper {
  public:
-  explicit LoginManagerTest(bool should_launch_browser);
+  explicit LoginManagerTestHelper(bool should_launch_browser);

[Jun Mukai, 2014/05/07 01:01:41]

should_launch_browser_ is only referred in SetUpInProcessBrowserTestFixture(). 
Can we move this as a parameter of SetUpLoginUtils()?

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

Done.

 
-  // Overriden from InProcessBrowserTest.
-  virtual void CleanUpOnMainThread() OVERRIDE;
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
-  virtual void SetUpOnMainThread() OVERRIDE;
+  // Sets up web contents. Guarantees that WebUI has been initialized by
+  // waiting for NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE notification.
+  void SetUp();
+  void SetUpCommandLine(CommandLine* command_line);
+  void SetUpLoginUtils();
+  void CleanUp();
 
   // Registers user with given |username| on device.
   // Should be called in PRE_* test.
@@ -40,18 +38,19 @@ class LoginManagerTest : public InProcessBrowserTest {
   void SetExpectedCredentials(const std::string& username,
                               const std::string& password);
 
-  // Tries to login with |username| and |password|. Returns false if attempt
+  // Tries to log in with |username| and |password|. Returns false if attempt
   // has failed.
-  bool TryToLogin(const std::string& username, const std::string& password);
+  bool TryToLogIn(const std::string& username, const std::string& password);
 
   // Tries to add user to session with |username| and |password|. Returns false
   // if attempt has failed. this function does the same as TryToLogin but
   // doesn't check that new user become active user.
-  bool AddUserTosession(const std::string& username,
+  bool AddUserToSession(const std::string& username,
                         const std::string& password);
 
-  // Login user with |username|. User should be registered using RegisterUser().
-  void LoginUser(const std::string& username);
+  // Log in user with |username|. User should be registered using
+  // RegisterUser().
+  void LogInUser(const std::string& username);
 
   // Add user with |username| to session.
   void AddUser(const std::string& username);
@@ -76,9 +75,9 @@ class LoginManagerTest : public InProcessBrowserTest {
   content::WebContents* web_contents_;
   test::JSChecker js_checker_;
 
-  DISALLOW_COPY_AND_ASSIGN(LoginManagerTest);
+  DISALLOW_COPY_AND_ASSIGN(LoginManagerTestHelper);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_MANAGER_TEST_H_
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_MANAGER_TEST_HELPER_H_