Delay fetching account info until OnRefreshTokensLoaded().

components/signin/core/browser/account_fetcher_service.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/signin/core/browser/account_fetcher_service.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/profiler/scoped_tracker.h"
@@ skipping 80 matching lines @@
 }
 
 void AccountFetcherService::Shutdown() {
   token_service_->RemoveObserver(this);
   // child_info_request_ is an invalidation handler and needs to be
   // unregistered during the lifetime of the invalidation service.
   child_info_request_.reset();
   shutdown_called_ = true;
 }
 
-void AccountFetcherService::EnableNetworkFetches() {
-  DCHECK(CalledOnValidThread());
-  DCHECK(!network_fetches_enabled_);
-  network_fetches_enabled_ = true;
-  // If there are accounts in |pending_user_info_fetches_|, they were deemed
-  // invalid after being loaded from prefs and need to be fetched now instead of
-  // waiting after the timer.
-  for (const std::string& account_id : pending_user_info_fetches_)
-    StartFetchingUserInfo(account_id);
-  pending_user_info_fetches_.clear();
-
-  // Now that network fetches are enabled, schedule the next refresh.
-  ScheduleNextRefresh();
-}
-
 bool AccountFetcherService::IsAllUserInfoFetched() const {
   return user_info_requests_.empty();
 }
 
 void AccountFetcherService::FetchUserInfoBeforeSignin(
     const std::string& account_id) {
   RefreshAccountInfo(account_id, false);
 }
 
 void AccountFetcherService::RefreshAllAccountInfo(bool only_fetch_if_invalid) {
@@ skipping 47 matching lines @@
     timer_.Start(FROM_HERE, kRefreshFromTokenServiceDelay - time_since_update,
                  this,
                  &AccountFetcherService::RefreshAllAccountsAndScheduleNext);
   }
 }
 
 // Starts fetching user information. This is called periodically to refresh.
 void AccountFetcherService::StartFetchingUserInfo(
     const std::string& account_id) {
   DCHECK(CalledOnValidThread());
-  if (!network_fetches_enabled_) {
-    pending_user_info_fetches_.push_back(account_id);
+  if (!network_fetches_enabled_)
     return;
-  }
 
   if (!ContainsKey(user_info_requests_, account_id)) {
     DVLOG(1) << "StartFetching " << account_id;
     scoped_ptr<AccountInfoFetcher> fetcher(new AccountInfoFetcher(
         token_service_, signin_client_->GetURLRequestContext(), this,
         account_id));
     user_info_requests_.set(account_id, fetcher.Pass());
     user_info_requests_.get(account_id)->Start();
   }
 }
@@ skipping 12 matching lines @@
   child_request_account_id_.clear();
   child_info_request_.reset();
 }
 
 void AccountFetcherService::RefreshAccountInfo(const std::string& account_id,
                                                bool only_fetch_if_invalid) {
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 AccountFetcherService::OnRefreshTokenAvailable"));

[Roger Tawa OOO till Jul 10th, 2015/10/21 19:09:00]

Nit: fix method name in string.

 
   TRACE_EVENT1("AccountFetcherService",
                "AccountFetcherService::RefreshAccountInfo",
                "account_id",
                account_id);
   DVLOG(1) << "AVAILABLE " << account_id;
 
   account_tracker_service_->StartTrackingAccount(account_id);
   const AccountInfo& info =
       account_tracker_service_->GetAccountInfo(account_id);
@@ skipping 78 matching lines @@
                "account_id",
                account_id);
 
   DVLOG(1) << "REVOKED " << account_id;
   user_info_requests_.erase(account_id);
   UpdateChildInfo();
   account_tracker_service_->StopTrackingAccount(account_id);
 }
 
 void AccountFetcherService::OnRefreshTokensLoaded() {
-  // OnRefreshTokenAvailable has been called for all accounts by this point.
-  // Maybe remove this after further investigation.
+  DCHECK(CalledOnValidThread());
+  if (!network_fetches_enabled_) {
+    network_fetches_enabled_ = true;
+    ScheduleNextRefresh();
+  }
   RefreshAllAccountInfo(true);
   UpdateChildInfo();
 }