| Index: chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
|
| diff --git a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
|
| index 92ab82a6bc27253c3545691ef7a9746ab46a0231..de0ffffc656eae3e20364aa635262b01b1a99a11 100644
|
| --- a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
|
| +++ b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
|
| @@ -205,13 +205,6 @@ class CryptohomeAuthenticatorTest : public testing::Test {
|
| .WillByDefault(Invoke(MockAuthStatusConsumer::OnFailQuitAndFail));
|
| }
|
|
|
| - // Allow test to fail and exit gracefully, even if
|
| - // OnRetailModeAuthSuccess() wasn't supposed to happen.
|
| - void FailOnRetailModeLoginSuccess() {
|
| - ON_CALL(consumer_, OnRetailModeAuthSuccess(_)).WillByDefault(
|
| - Invoke(MockAuthStatusConsumer::OnRetailModeSuccessQuitAndFail));
|
| - }
|
| -
|
| // Allow test to fail and exit gracefully, even if OnAuthSuccess()
|
| // wasn't supposed to happen.
|
| void FailOnLoginSuccess() {
|
| @@ -232,12 +225,6 @@ class CryptohomeAuthenticatorTest : public testing::Test {
|
| .RetiresOnSaturation();
|
| }
|
|
|
| - void ExpectRetailModeLoginSuccess() {
|
| - EXPECT_CALL(consumer_, OnRetailModeAuthSuccess(_))
|
| - .WillOnce(Invoke(MockAuthStatusConsumer::OnRetailModeSuccessQuit))
|
| - .RetiresOnSaturation();
|
| - }
|
| -
|
| void ExpectLoginSuccess(const UserContext& user_context) {
|
| EXPECT_CALL(consumer_, OnAuthSuccess(user_context))
|
| .WillOnce(Invoke(MockAuthStatusConsumer::OnSuccessQuit))
|
| @@ -581,32 +568,6 @@ TEST_F(CryptohomeAuthenticatorTest, DriveGuestLoginButFail) {
|
| base::MessageLoop::current()->Run();
|
| }
|
|
|
| -TEST_F(CryptohomeAuthenticatorTest, DriveRetailModeUserLogin) {
|
| - ExpectRetailModeLoginSuccess();
|
| - FailOnLoginFailure();
|
| -
|
| - // Set up mock async method caller to respond as though a tmpfs mount
|
| - // attempt has occurred and succeeded.
|
| - mock_caller_->SetUp(true, cryptohome::MOUNT_ERROR_NONE);
|
| - EXPECT_CALL(*mock_caller_, AsyncMountGuest(_)).Times(1).RetiresOnSaturation();
|
| -
|
| - auth_->LoginRetailMode();
|
| - base::MessageLoop::current()->Run();
|
| -}
|
| -
|
| -TEST_F(CryptohomeAuthenticatorTest, DriveRetailModeLoginButFail) {
|
| - FailOnRetailModeLoginSuccess();
|
| - ExpectLoginFailure(AuthFailure(AuthFailure::COULD_NOT_MOUNT_TMPFS));
|
| -
|
| - // Set up mock async method caller to respond as though a tmpfs mount
|
| - // attempt has occurred and failed.
|
| - mock_caller_->SetUp(false, cryptohome::MOUNT_ERROR_NONE);
|
| - EXPECT_CALL(*mock_caller_, AsyncMountGuest(_)).Times(1).RetiresOnSaturation();
|
| -
|
| - auth_->LoginRetailMode();
|
| - base::MessageLoop::current()->Run();
|
| -}
|
| -
|
| TEST_F(CryptohomeAuthenticatorTest, DriveDataResync) {
|
| UserContext expected_user_context(user_context_with_transformed_key_);
|
| expected_user_context.SetUserIDHash(
|
|
|