| Index: chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc
|
| diff --git a/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc b/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc
|
| index 40346d4c15e938088b4802b47354283c15c418d2..8e4515bc3294b444dc2e4a7d883019c47fc223db 100644
|
| --- a/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc
|
| +++ b/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc
|
| @@ -125,7 +125,7 @@ class ExistingUserControllerAutoLoginTest : public ::testing::Test {
|
| }
|
|
|
| void ConfigureAutoLogin() {
|
| - existing_user_controller()->ConfigurePublicSessionAutoLogin();
|
| + existing_user_controller()->ConfigureAutoLogin();
|
| }
|
|
|
| const std::string auto_login_user_id_ =
|
| @@ -161,24 +161,24 @@ TEST_F(ExistingUserControllerAutoLoginTest, StartAutoLoginTimer) {
|
| // Timer shouldn't start until signin screen is ready.
|
| set_auto_login_account_id(auto_login_account_id_);
|
| set_auto_login_delay(kAutoLoginDelay2);
|
| - existing_user_controller()->StartPublicSessionAutoLoginTimer();
|
| + existing_user_controller()->StartAutoLoginTimer();
|
| EXPECT_FALSE(auto_login_timer());
|
|
|
| // Timer shouldn't start if the policy isn't set.
|
| set_auto_login_account_id(EmptyAccountId());
|
| existing_user_controller()->OnSigninScreenReady();
|
| - existing_user_controller()->StartPublicSessionAutoLoginTimer();
|
| + existing_user_controller()->StartAutoLoginTimer();
|
| EXPECT_FALSE(auto_login_timer());
|
|
|
| // Timer shouldn't fire in the middle of a login attempt.
|
| set_auto_login_account_id(auto_login_account_id_);
|
| set_is_login_in_progress(true);
|
| - existing_user_controller()->StartPublicSessionAutoLoginTimer();
|
| + existing_user_controller()->StartAutoLoginTimer();
|
| EXPECT_FALSE(auto_login_timer());
|
|
|
| // Otherwise start.
|
| set_is_login_in_progress(false);
|
| - existing_user_controller()->StartPublicSessionAutoLoginTimer();
|
| + existing_user_controller()->StartAutoLoginTimer();
|
| ASSERT_TRUE(auto_login_timer());
|
| EXPECT_TRUE(auto_login_timer()->IsRunning());
|
| EXPECT_EQ(auto_login_timer()->GetCurrentDelay().InMilliseconds(),
|
| @@ -190,11 +190,11 @@ TEST_F(ExistingUserControllerAutoLoginTest, StopAutoLoginTimer) {
|
| set_auto_login_account_id(auto_login_account_id_);
|
| set_auto_login_delay(kAutoLoginDelay2);
|
|
|
| - existing_user_controller()->StartPublicSessionAutoLoginTimer();
|
| + existing_user_controller()->StartAutoLoginTimer();
|
| ASSERT_TRUE(auto_login_timer());
|
| EXPECT_TRUE(auto_login_timer()->IsRunning());
|
|
|
| - existing_user_controller()->StopPublicSessionAutoLoginTimer();
|
| + existing_user_controller()->StopAutoLoginTimer();
|
| ASSERT_TRUE(auto_login_timer());
|
| EXPECT_FALSE(auto_login_timer()->IsRunning());
|
| }
|
| @@ -212,7 +212,7 @@ TEST_F(ExistingUserControllerAutoLoginTest, ResetAutoLoginTimer) {
|
|
|
| // Start the timer.
|
| set_auto_login_delay(kAutoLoginDelay2);
|
| - existing_user_controller()->StartPublicSessionAutoLoginTimer();
|
| + existing_user_controller()->StartAutoLoginTimer();
|
| ASSERT_TRUE(auto_login_timer());
|
| EXPECT_TRUE(auto_login_timer()->IsRunning());
|
| EXPECT_EQ(auto_login_timer()->GetCurrentDelay().InMilliseconds(),
|
|
|