Delay fetching account info until OnRefreshTokensLoaded().

components/signin/core/browser/account_tracker_service_unittest.cc

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..9cbe4f4e2daf3a4cb284df2556ade42f9c694530 100644
--- a/components/signin/core/browser/account_tracker_service_unittest.cc
+++ b/components/signin/core/browser/account_tracker_service_unittest.cc
@@ -273,7 +273,7 @@ class AccountTrackerServiceTest : public testing::Test {
                                  fake_oauth2_token_service_.get(),
                                  account_tracker_.get(), nullptr);
 
-    account_fetcher_->EnableNetworkFetches();
+    account_fetcher_->OnRefreshTokensLoaded();
   }
 
   void TearDown() override {
@@ -454,7 +454,7 @@ TEST_F(AccountTrackerServiceTest, TokenAlreadyExists) {
   tracker.Initialize(signin_client());
 
   fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
-  fetcher.EnableNetworkFetches();
+  fetcher.OnRefreshTokensLoaded();
   ASSERT_FALSE(fetcher.IsAllUserInfoFetched());
   ASSERT_TRUE(observer.CheckEvents());
   tracker.RemoveObserver(&observer);
@@ -545,8 +545,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");
@@ -624,7 +624,7 @@ TEST_F(AccountTrackerServiceTest, Persistence) {
 
     FakeAccountFetcherService fetcher;
     fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
-    fetcher.EnableNetworkFetches();
+    fetcher.OnRefreshTokensLoaded();
     // Remove an account.
     // This will allow testing removal as well as child accounts which is only
     // allowed for a single account.
@@ -674,7 +674,7 @@ TEST_F(AccountTrackerServiceTest, UpgradeToFullAccountInfo) {
     tracker.Initialize(signin_client());
     AccountFetcherService fetcher;
     fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
-    fetcher.EnableNetworkFetches();
+    fetcher.OnRefreshTokensLoaded();
     SimulateTokenAvailable("incomplete");
     ReturnOAuthUrlFetchSuccessIncomplete("incomplete");
     tracker.Shutdown();
@@ -693,7 +693,7 @@ TEST_F(AccountTrackerServiceTest, UpgradeToFullAccountInfo) {
 
     // Enable network fetches and simulate the same account getting a refresh
     // token containing all the info.
-    fetcher.EnableNetworkFetches();
+    fetcher.OnRefreshTokensLoaded();
     SimulateTokenAvailable("incomplete");
     ReturnOAuthUrlFetchSuccess("incomplete");
 
@@ -719,7 +719,7 @@ TEST_F(AccountTrackerServiceTest, UpgradeToFullAccountInfo) {
     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());
@@ -741,7 +741,7 @@ TEST_F(AccountTrackerServiceTest, TimerRefresh) {
     tracker.Initialize(signin_client());
     AccountFetcherService fetcher;
     fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
-    fetcher.EnableNetworkFetches();
+    fetcher.OnRefreshTokensLoaded();
     SimulateTokenAvailable("alpha");
     ReturnOAuthUrlFetchSuccess("alpha");
     SimulateTokenAvailable("beta");
@@ -771,7 +771,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();
@@ -797,7 +797,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();
@@ -813,7 +813,7 @@ TEST_F(AccountTrackerServiceTest, LegacyDottedAccountIds) {
     tracker.Initialize(signin_client());
     AccountFetcherService fetcher;
     fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
-    fetcher.EnableNetworkFetches();
+    fetcher.OnRefreshTokensLoaded();
     SimulateTokenAvailable("foo.bar@gmail.com");
     SimulateTokenAvailable("foobar@gmail.com");
     ReturnOAuthUrlFetchSuccess("foo.bar@gmail.com");
@@ -1033,7 +1033,7 @@ TEST_F(AccountTrackerServiceTest, ChildAccountBasic) {
   tracker.Initialize(signin_client());
   FakeAccountFetcherService fetcher;
   fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
-  fetcher.EnableNetworkFetches();
+  fetcher.OnRefreshTokensLoaded();
   AccountTrackerObserver observer;
   tracker.AddObserver(&observer);
   std::string child_id("child");
@@ -1064,7 +1064,7 @@ TEST_F(AccountTrackerServiceTest, ChildAccountUpdatedAndRevoked) {
   tracker.Initialize(signin_client());
   FakeAccountFetcherService fetcher;
   fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
-  fetcher.EnableNetworkFetches();
+  fetcher.OnRefreshTokensLoaded();
   AccountTrackerObserver observer;
   tracker.AddObserver(&observer);
   std::string child_id("child");
@@ -1089,7 +1089,7 @@ TEST_F(AccountTrackerServiceTest, ChildAccountUpdatedAndRevokedWithUpdate) {
   tracker.Initialize(signin_client());
   FakeAccountFetcherService fetcher;
   fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
-  fetcher.EnableNetworkFetches();
+  fetcher.OnRefreshTokensLoaded();
   AccountTrackerObserver observer;
   tracker.AddObserver(&observer);
   std::string child_id("child");
@@ -1115,7 +1115,7 @@ TEST_F(AccountTrackerServiceTest, ChildAccountUpdatedTwiceThenRevoked) {
   tracker.Initialize(signin_client());
   FakeAccountFetcherService fetcher;
   fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
-  fetcher.EnableNetworkFetches();
+  fetcher.OnRefreshTokensLoaded();
   AccountTrackerObserver observer;
   tracker.AddObserver(&observer);
   std::string child_id("child");
@@ -1143,7 +1143,7 @@ TEST_F(AccountTrackerServiceTest, ChildAccountGraduation) {
   tracker.Initialize(signin_client());
   FakeAccountFetcherService fetcher;
   fetcher.Initialize(signin_client(), token_service(), &tracker, nullptr);
-  fetcher.EnableNetworkFetches();
+  fetcher.OnRefreshTokensLoaded();
   AccountTrackerObserver observer;
   tracker.AddObserver(&observer);
   std::string child_id("child");