| Index: chrome/browser/chromeos/login/test_login_utils.h
|
| diff --git a/chrome/browser/chromeos/login/mock_authenticator.h b/chrome/browser/chromeos/login/test_login_utils.h
|
| similarity index 51%
|
| copy from chrome/browser/chromeos/login/mock_authenticator.h
|
| copy to chrome/browser/chromeos/login/test_login_utils.h
|
| index d08b9065b81d9e6a74c8edd07fdcf293097d5ca1..13ba4b534f299cc14e1828ffb73b18811a20203d 100644
|
| --- a/chrome/browser/chromeos/login/mock_authenticator.h
|
| +++ b/chrome/browser/chromeos/login/test_login_utils.h
|
| @@ -2,16 +2,14 @@
|
| // 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_MOCK_AUTHENTICATOR_H_
|
| -#define CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_AUTHENTICATOR_H_
|
| +#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_TEST_LOGIN_UTILS_H_
|
| +#define CHROME_BROWSER_CHROMEOS_LOGIN_TEST_LOGIN_UTILS_H_
|
|
|
| #include <string>
|
|
|
| -#include "base/compiler_specific.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "chrome/browser/chromeos/login/authenticator.h"
|
| #include "chrome/browser/chromeos/login/login_utils.h"
|
| -#include "content/public/browser/browser_thread.h"
|
| #include "google_apis/gaia/google_service_auth_error.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -21,60 +19,6 @@ namespace chromeos {
|
|
|
| class LoginStatusConsumer;
|
|
|
| -class MockAuthenticator : public Authenticator {
|
| - public:
|
| - MockAuthenticator(LoginStatusConsumer* consumer,
|
| - const std::string& expected_username,
|
| - const std::string& expected_password)
|
| - : Authenticator(consumer),
|
| - expected_username_(expected_username),
|
| - expected_password_(expected_password) {
|
| - }
|
| -
|
| - virtual void CompleteLogin(Profile* profile,
|
| - const std::string& username,
|
| - const std::string& password) OVERRIDE;
|
| -
|
| - virtual void AuthenticateToLogin(Profile* profile,
|
| - const std::string& username,
|
| - const std::string& password,
|
| - const std::string& login_token,
|
| - const std::string& login_captcha) OVERRIDE;
|
| -
|
| - virtual void AuthenticateToUnlock(const std::string& username,
|
| - const std::string& password) OVERRIDE;
|
| -
|
| - virtual void LoginRetailMode() OVERRIDE;
|
| - virtual void LoginAsPublicAccount(const std::string& username) OVERRIDE;
|
| - virtual void LoginOffTheRecord() OVERRIDE;
|
| -
|
| - virtual void OnRetailModeLoginSuccess() OVERRIDE;
|
| -
|
| - virtual void OnLoginSuccess(bool request_pending) OVERRIDE;
|
| -
|
| - virtual void OnLoginFailure(const LoginFailure& failure) OVERRIDE;
|
| -
|
| - virtual void RecoverEncryptedData(
|
| - const std::string& old_password) OVERRIDE {}
|
| -
|
| - virtual void ResyncEncryptedData() OVERRIDE {}
|
| -
|
| - virtual void RetryAuth(Profile* profile,
|
| - const std::string& username,
|
| - const std::string& password,
|
| - const std::string& login_token,
|
| - const std::string& login_captcha) OVERRIDE {}
|
| -
|
| - protected:
|
| - virtual ~MockAuthenticator() {}
|
| -
|
| - private:
|
| - std::string expected_username_;
|
| - std::string expected_password_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(MockAuthenticator);
|
| -};
|
| -
|
| class TestLoginUtils : public LoginUtils {
|
| public:
|
| TestLoginUtils(const std::string& expected_username,
|
| @@ -82,7 +26,7 @@ class TestLoginUtils : public LoginUtils {
|
| virtual ~TestLoginUtils();
|
|
|
| virtual void DoBrowserLaunch(Profile* profile,
|
| - LoginDisplayHost* login_host) OVERRIDE {}
|
| + LoginDisplayHost* login_host) OVERRIDE {}
|
| virtual void PrepareProfile(const std::string& username,
|
| const std::string& display_email,
|
| const std::string& password,
|
| @@ -115,6 +59,8 @@ class TestLoginUtils : public LoginUtils {
|
| const CommandLine& base_command_line,
|
| CommandLine* command_line) OVERRIDE;
|
|
|
| + virtual void InitRlzDelayed() OVERRIDE;
|
| +
|
| virtual void TransferDefaultCookiesAndServerBoundCerts(
|
| Profile* default_profile,
|
| Profile* new_profile) OVERRIDE;
|
| @@ -134,4 +80,4 @@ class TestLoginUtils : public LoginUtils {
|
|
|
| } // namespace chromeos
|
|
|
| -#endif // CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_AUTHENTICATOR_H_
|
| +#endif // CHROME_BROWSER_CHROMEOS_LOGIN_TEST_LOGIN_UTILS_H_
|
|
|