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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/signin/core/browser/account_tracker_service_unittest.cc

Issue 1380103004: Delay fetching account info until OnRefreshTokensLoaded(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix iOs 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 | « components/signin/core/browser/account_fetcher_service.cc ('k') | components/signin/core/browser/child_account_info_fetcher_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/signin/core/browser/account_tracker_service_unittest.cc
diff --git a/components/signin/core/browser/account_tracker_service_unittest.cc b/components/signin/core/browser/account_tracker_service_unittest.cc
index eb6751cb46cea84a464a142692c53630c918978e..736839b08ec9dcd26caa512e4399741e31af6d72 100644
--- a/components/signin/core/browser/account_tracker_service_unittest.cc
+++ b/components/signin/core/browser/account_tracker_service_unittest.cc
@@ -271,9 +271,9 @@ class AccountTrackerServiceTest : public testing::Test {
account_fetcher_.reset(new AccountFetcherService());
account_fetcher_->Initialize(signin_client_.get(),
fake_oauth2_token_service_.get(),
- account_tracker_.get(), nullptr);
+ account_tracker_.get());
- account_fetcher_->EnableNetworkFetches();
+ account_fetcher_->OnRefreshTokensLoaded();
}
void TearDown() override {
@@ -453,8 +453,8 @@ TEST_F(AccountTrackerServiceTest, TokenAlreadyExists) {
tracker.AddObserver(&observer);
tracker.Initialize(signin_client());
- fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
- fetcher.EnableNetworkFetches();
+ fetcher.Initialize(signin_client(), token_service(), &tracker);
+ fetcher.OnRefreshTokensLoaded();
ASSERT_FALSE(fetcher.IsAllUserInfoFetched());
ASSERT_TRUE(observer.CheckEvents());
tracker.RemoveObserver(&observer);
@@ -535,8 +535,7 @@ TEST_F(AccountTrackerServiceTest, GetAccountInfo_TokenAvailable_EnableNetwork) {
tracker.Initialize(signin_client());
AccountFetcherService fetcher_service;
- fetcher_service.Initialize(signin_client(), token_service(), &tracker,
- nullptr);
+ fetcher_service.Initialize(signin_client(), token_service(), &tracker);
SimulateTokenAvailable("alpha");
IssueAccessToken("alpha");
@@ -545,8 +544,8 @@ TEST_F(AccountTrackerServiceTest, GetAccountInfo_TokenAvailable_EnableNetwork) {
gaia::GaiaOAuthClient::kUrlFetcherId);
ASSERT_FALSE(fetcher);
- // Enable the network to create the fetcher then issue the access token.
- fetcher_service.EnableNetworkFetches();
+ // Enable the network fetches and refresh invalid accounts information.
+ fetcher_service.OnRefreshTokensLoaded();
// Fetcher was created and executes properly.
ReturnOAuthUrlFetchSuccess("alpha");
@@ -623,8 +622,8 @@ TEST_F(AccountTrackerServiceTest, Persistence) {
CheckAccountDetails("beta", infos[1]);
FakeAccountFetcherService fetcher;
- fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
- fetcher.EnableNetworkFetches();
+ fetcher.Initialize(signin_client(), token_service(), &tracker);
+ fetcher.OnRefreshTokensLoaded();
// Remove an account.
// This will allow testing removal as well as child accounts which is only
// allowed for a single account.
@@ -673,8 +672,8 @@ TEST_F(AccountTrackerServiceTest, UpgradeToFullAccountInfo) {
AccountTrackerService tracker;
tracker.Initialize(signin_client());
AccountFetcherService fetcher;
- fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
- fetcher.EnableNetworkFetches();
+ fetcher.Initialize(signin_client(), token_service(), &tracker);
+ fetcher.OnRefreshTokensLoaded();
SimulateTokenAvailable("incomplete");
ReturnOAuthUrlFetchSuccessIncomplete("incomplete");
tracker.Shutdown();
@@ -685,15 +684,14 @@ TEST_F(AccountTrackerServiceTest, UpgradeToFullAccountInfo) {
AccountTrackerService tracker;
tracker.Initialize(signin_client());
AccountFetcherService fetcher;
- fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
+ fetcher.Initialize(signin_client(), token_service(), &tracker);
+ fetcher.OnRefreshTokensLoaded();
// Validate that the loaded AccountInfo from prefs is considered invalid.
std::vector<AccountInfo> infos = tracker.GetAccounts();
ASSERT_EQ(1u, infos.size());
ASSERT_FALSE(infos[0].IsValid());
- // Enable network fetches and simulate the same account getting a refresh
- // token containing all the info.
- fetcher.EnableNetworkFetches();
+ // Simulate the same account getting a refresh token with all the info.
SimulateTokenAvailable("incomplete");
ReturnOAuthUrlFetchSuccess("incomplete");
@@ -714,12 +712,12 @@ TEST_F(AccountTrackerServiceTest, UpgradeToFullAccountInfo) {
tracker.AddObserver(&observer);
tracker.Initialize(signin_client());
AccountFetcherService fetcher;
- fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
+ fetcher.Initialize(signin_client(), token_service(), &tracker);
ASSERT_TRUE(observer.CheckEvents(TrackingEvent(UPDATED, "incomplete")));
// Enabling network fetches shouldn't cause any actual fetch since the
// AccountInfos loaded from prefs should be valid.
- fetcher.EnableNetworkFetches();
+ fetcher.OnRefreshTokensLoaded();
std::vector<AccountInfo> infos = tracker.GetAccounts();
ASSERT_EQ(1u, infos.size());
@@ -740,8 +738,8 @@ TEST_F(AccountTrackerServiceTest, TimerRefresh) {
AccountTrackerService tracker;
tracker.Initialize(signin_client());
AccountFetcherService fetcher;
- fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
- fetcher.EnableNetworkFetches();
+ fetcher.Initialize(signin_client(), token_service(), &tracker);
+ fetcher.OnRefreshTokensLoaded();
SimulateTokenAvailable("alpha");
ReturnOAuthUrlFetchSuccess("alpha");
SimulateTokenAvailable("beta");
@@ -763,7 +761,7 @@ TEST_F(AccountTrackerServiceTest, TimerRefresh) {
AccountTrackerService tracker;
tracker.Initialize(signin_client());
AccountFetcherService fetcher;
- fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
+ fetcher.Initialize(signin_client(), token_service(), &tracker);
ASSERT_TRUE(fetcher.IsAllUserInfoFetched());
std::vector<AccountInfo> infos = tracker.GetAccounts();
@@ -771,7 +769,7 @@ TEST_F(AccountTrackerServiceTest, TimerRefresh) {
ASSERT_TRUE(infos[0].IsValid());
ASSERT_TRUE(infos[1].IsValid());
- fetcher.EnableNetworkFetches();
+ fetcher.OnRefreshTokensLoaded();
ASSERT_TRUE(fetcher.IsAllUserInfoFetched());
tracker.Shutdown();
fetcher.Shutdown();
@@ -789,7 +787,7 @@ TEST_F(AccountTrackerServiceTest, TimerRefresh) {
AccountTrackerService tracker;
tracker.Initialize(signin_client());
AccountFetcherService fetcher;
- fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
+ fetcher.Initialize(signin_client(), token_service(), &tracker);
ASSERT_TRUE(fetcher.IsAllUserInfoFetched());
std::vector<AccountInfo> infos = tracker.GetAccounts();
@@ -797,7 +795,7 @@ TEST_F(AccountTrackerServiceTest, TimerRefresh) {
ASSERT_TRUE(infos[0].IsValid());
ASSERT_TRUE(infos[1].IsValid());
- fetcher.EnableNetworkFetches();
+ fetcher.OnRefreshTokensLoaded();
ASSERT_FALSE(fetcher.IsAllUserInfoFetched());
tracker.Shutdown();
fetcher.Shutdown();
@@ -812,8 +810,8 @@ TEST_F(AccountTrackerServiceTest, LegacyDottedAccountIds) {
AccountTrackerService tracker;
tracker.Initialize(signin_client());
AccountFetcherService fetcher;
- fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
- fetcher.EnableNetworkFetches();
+ fetcher.Initialize(signin_client(), token_service(), &tracker);
+ fetcher.OnRefreshTokensLoaded();
SimulateTokenAvailable("foo.bar@gmail.com");
SimulateTokenAvailable("foobar@gmail.com");
ReturnOAuthUrlFetchSuccess("foo.bar@gmail.com");
@@ -832,7 +830,7 @@ TEST_F(AccountTrackerServiceTest, LegacyDottedAccountIds) {
AccountTrackerService tracker;
tracker.Initialize(signin_client());
AccountFetcherService fetcher;
- fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
+ fetcher.Initialize(signin_client(), token_service(), &tracker);
ASSERT_TRUE(fetcher.IsAllUserInfoFetched());
std::vector<AccountInfo> infos = tracker.GetAccounts();
@@ -1032,8 +1030,8 @@ TEST_F(AccountTrackerServiceTest, ChildAccountBasic) {
AccountTrackerService tracker;
tracker.Initialize(signin_client());
FakeAccountFetcherService fetcher;
- fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
- fetcher.EnableNetworkFetches();
+ fetcher.Initialize(signin_client(), token_service(), &tracker);
+ fetcher.OnRefreshTokensLoaded();
AccountTrackerObserver observer;
tracker.AddObserver(&observer);
std::string child_id("child");
@@ -1063,8 +1061,8 @@ TEST_F(AccountTrackerServiceTest, ChildAccountUpdatedAndRevoked) {
AccountTrackerService tracker;
tracker.Initialize(signin_client());
FakeAccountFetcherService fetcher;
- fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
- fetcher.EnableNetworkFetches();
+ fetcher.Initialize(signin_client(), token_service(), &tracker);
+ fetcher.OnRefreshTokensLoaded();
AccountTrackerObserver observer;
tracker.AddObserver(&observer);
std::string child_id("child");
@@ -1088,8 +1086,8 @@ TEST_F(AccountTrackerServiceTest, ChildAccountUpdatedAndRevokedWithUpdate) {
AccountTrackerService tracker;
tracker.Initialize(signin_client());
FakeAccountFetcherService fetcher;
- fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
- fetcher.EnableNetworkFetches();
+ fetcher.Initialize(signin_client(), token_service(), &tracker);
+ fetcher.OnRefreshTokensLoaded();
AccountTrackerObserver observer;
tracker.AddObserver(&observer);
std::string child_id("child");
@@ -1114,8 +1112,8 @@ TEST_F(AccountTrackerServiceTest, ChildAccountUpdatedTwiceThenRevoked) {
AccountTrackerService tracker;
tracker.Initialize(signin_client());
FakeAccountFetcherService fetcher;
- fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
- fetcher.EnableNetworkFetches();
+ fetcher.Initialize(signin_client(), token_service(), &tracker);
+ fetcher.OnRefreshTokensLoaded();
AccountTrackerObserver observer;
tracker.AddObserver(&observer);
std::string child_id("child");
@@ -1142,8 +1140,8 @@ TEST_F(AccountTrackerServiceTest, ChildAccountGraduation) {
AccountTrackerService tracker;
tracker.Initialize(signin_client());
FakeAccountFetcherService fetcher;
- fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
- fetcher.EnableNetworkFetches();
+ fetcher.Initialize(signin_client(), token_service(), &tracker);
+ fetcher.OnRefreshTokensLoaded();
AccountTrackerObserver observer;
tracker.AddObserver(&observer);
std::string child_id("child");
« no previous file with comments | « components/signin/core/browser/account_fetcher_service.cc ('k') | components/signin/core/browser/child_account_info_fetcher_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698