Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(499)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/parallel_authenticator_unittest.cc

Issue 23903051: Eliminate CHECK from CryptohomeLibrary::LoadSystemSalt (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/chromeos/login/parallel_authenticator.cc ('K') | « chrome/browser/chromeos/login/parallel_authenticator.cc ('k') | chrome/browser/extensions/api/music_manager_private/device_id_chromeos.cc » ('j') | chrome/browser/renderer_host/pepper/device_id_fetcher.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
index e1896f2d8a802122511390c734656a32e097287b..5f56e83bd0d42bf6e9ba43cc887b719f4972b36b 100644
--- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
@@ -517,7 +517,7 @@ TEST_F(ParallelAuthenticatorTest, DriveDataRecover) {
.Times(1)
.RetiresOnSaturation();
EXPECT_CALL(*mock_cryptohome_library_, GetSystemSalt())
- .WillOnce(Return(std::string()))
+ .WillOnce(Return(std::string("mock_system_salt")))
.RetiresOnSaturation();
state_->PresetOnlineLoginStatus(LoginFailure::LoginFailureNone());
@@ -538,7 +538,7 @@ TEST_F(ParallelAuthenticatorTest, DriveDataRecoverButFail) {
.Times(1)
.RetiresOnSaturation();
EXPECT_CALL(*mock_cryptohome_library_, GetSystemSalt())
- .WillOnce(Return(std::string()))
+ .WillOnce(Return(std::string("mock_system_salt")))
.RetiresOnSaturation();
SetAttemptState(auth_.get(), state_.release());
@@ -649,7 +649,7 @@ TEST_F(ParallelAuthenticatorTest, DriveUnlock) {
.Times(1)
.RetiresOnSaturation();
EXPECT_CALL(*mock_cryptohome_library_, GetSystemSalt())
- .WillOnce(Return(std::string()))
+ .WillOnce(Return(std::string("mock_system_salt")))
.RetiresOnSaturation();
auth_->AuthenticateToUnlock(UserContext(username_,
« chrome/browser/chromeos/login/parallel_authenticator.cc ('K') | « chrome/browser/chromeos/login/parallel_authenticator.cc ('k') | chrome/browser/extensions/api/music_manager_private/device_id_chromeos.cc » ('j') | chrome/browser/renderer_host/pepper/device_id_fetcher.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698