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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc

Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names
Patch Set: Created 5 years, 2 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
« no previous file with comments | « chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc ('k') | chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc
diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc
index bf8fbfe2ec74c4fa1b4892329ff766646b3385cf..c82a398527e186847fceb99997862475f7a39127 100644
--- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc
+++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc
@@ -46,9 +46,6 @@
void CreateLimiter();
void SetUpUserManager();
-
- const AccountId test_account_id_ = AccountId::FromUserEmail(kTestUser);
-
TestingPrefServiceSimple* GetTestingLocalState();
scoped_refptr<base::TestSimpleTaskRunner> runner_;
@@ -72,7 +69,8 @@
runner_handle_(runner_),
user_manager_(new MockUserManager),
user_manager_enabler_(user_manager_),
- limiter_(NULL) {}
+ limiter_(NULL) {
+}
SAMLOfflineSigninLimiterTest::~SAMLOfflineSigninLimiterTest() {
DestroyLimiter();
@@ -105,7 +103,7 @@
profile_.reset(new TestingProfile);
SAMLOfflineSigninLimiterFactory::SetClockForTesting(&clock_);
- user_manager_->AddUser(test_account_id_);
+ user_manager_->AddUser(kTestUser);
profile_->set_profile_name(kTestUser);
clock_.Advance(base::TimeDelta::FromHours(1));
@@ -131,10 +129,8 @@
// Authenticate against GAIA without SAML. Verify that the flag enforcing
// online login and the time of last login with SAML are cleared.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
const PrefService::Preference* pref =
@@ -153,10 +149,8 @@
CreateLimiter();
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_OFFLINE);
pref = prefs->FindPreference(prefs::kSAMLLastGAIASignInTime);
@@ -180,10 +174,8 @@
// Authenticate against GAIA without SAML. Verify that the flag enforcing
// online login and the time of last login with SAML are cleared.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
const PrefService::Preference* pref =
@@ -202,10 +194,8 @@
CreateLimiter();
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_OFFLINE);
pref = prefs->FindPreference(prefs::kSAMLLastGAIASignInTime);
@@ -229,10 +219,8 @@
// Authenticate against GAIA without SAML. Verify that the flag enforcing
// online login and the time of last login with SAML are cleared.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
const PrefService::Preference* pref =
@@ -251,10 +239,8 @@
CreateLimiter();
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_OFFLINE);
pref = prefs->FindPreference(prefs::kSAMLLastGAIASignInTime);
@@ -278,10 +264,8 @@
// Authenticate against GAIA without SAML. Verify that the flag enforcing
// online login and the time of last login with SAML are cleared.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
const PrefService::Preference* pref =
@@ -309,10 +293,8 @@
// Authenticate against GAIA without SAML. Verify that the flag enforcing
// online login and the time of last login with SAML are cleared.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
const PrefService::Preference* pref =
@@ -343,10 +325,8 @@
// Authenticate against GAIA without SAML. Verify that the flag enforcing
// online login and the time of last login with SAML are cleared.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
const PrefService::Preference* pref =
@@ -364,10 +344,8 @@
// Authenticate against GAIA with SAML. Verify that the flag enforcing online
// login is cleared and the time of last login with SAML is set.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
base::Time last_gaia_signin_time = base::Time::FromInternalValue(
@@ -388,10 +366,8 @@
CreateLimiter();
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
last_gaia_signin_time = base::Time::FromInternalValue(
@@ -413,10 +389,8 @@
CreateLimiter();
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_OFFLINE);
last_gaia_signin_time = base::Time::FromInternalValue(
@@ -433,10 +407,8 @@
// set.
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(1);
runner_->RunPendingTasks();
}
@@ -449,10 +421,8 @@
// Authenticate against GAIA with SAML. Verify that the flag enforcing online
// login is cleared and the time of last login with SAML is set.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
base::Time last_gaia_signin_time = base::Time::FromInternalValue(
@@ -473,10 +443,8 @@
CreateLimiter();
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
last_gaia_signin_time = base::Time::FromInternalValue(
@@ -498,10 +466,8 @@
CreateLimiter();
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_OFFLINE);
last_gaia_signin_time = base::Time::FromInternalValue(
@@ -523,10 +489,10 @@
// last login with SAML is set.
CreateLimiter();
Sequence sequence;
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false))
.Times(1)
.InSequence(sequence);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true))
.Times(1)
.InSequence(sequence);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
@@ -545,10 +511,8 @@
// Authenticate against GAIA with SAML. Verify that the flag enforcing online
// login is cleared and the time of last login with SAML is set.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
const base::Time last_gaia_signin_time = base::Time::FromInternalValue(
@@ -561,10 +525,8 @@
// Set a zero time limit. Verify that the flag enforcing online login is set.
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(1);
prefs->SetInteger(prefs::kSAMLOfflineSigninTimeLimit, 0);
}
@@ -574,10 +536,8 @@
// Authenticate against GAIA with SAML. Verify that the flag enforcing online
// login is cleared and the time of last login with SAML is set.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
const base::Time last_gaia_signin_time = base::Time::FromInternalValue(
@@ -594,10 +554,8 @@
// changed.
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
runner_->RunUntilIdle();
}
@@ -614,10 +572,8 @@
// Authenticate against GAIA with SAML. Verify that the flag enforcing online
// login is cleared and the time of last login with SAML is updated.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
const base::Time last_gaia_signin_time = base::Time::FromInternalValue(
@@ -642,10 +598,8 @@
// Authenticate offline. Verify that the flag enforcing online login is
// set and the time of last login with SAML is not changed.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
- .Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
- .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(1);
limiter_->SignedIn(UserContext::AUTH_FLOW_OFFLINE);
const base::Time last_gaia_signin_time = base::Time::FromInternalValue(
« no previous file with comments | « chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc ('k') | chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698