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"
 #include "base/trace_event/trace_event.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/signin/core/browser/account_info_fetcher.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/child_account_info_fetcher.h"
 #include "components/signin/core/browser/refresh_token_annotation_request.h"
 #include "components/signin/core/browser/signin_client.h"
 #include "components/signin/core/common/signin_switches.h"
+#include "google_apis/gaia/oauth2_token_service_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace {
 
 const base::TimeDelta kRefreshFromTokenServiceDelay =
     base::TimeDelta::FromHours(24);
 
 bool AccountSupportsUserInfo(const std::string& account_id) {
   // Supervised users use a specially scoped token which when used for general
   // purposes causes the token service to raise spurious auth errors.
@@ skipping 66 matching lines @@
   // 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();
+  FetchPendingAccountInfo();
 
   // 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);
 }
 
+#if defined(OS_ANDROID)
+void AccountFetcherService::OnAccountIdNameMapSeeded() {
+  DCHECK(CalledOnValidThread());
+  DCHECK(token_service_->GetDelegate()->NeedsAccountIdNameMap());
+  FetchPendingAccountInfo();
+}
+#endif
+
 void AccountFetcherService::RefreshAllAccountInfo(bool only_fetch_if_invalid) {
   std::vector<std::string> accounts = token_service_->GetAccounts();
   for (std::vector<std::string>::const_iterator it = accounts.begin();
        it != accounts.end(); ++it) {
     RefreshAccountInfo(*it, only_fetch_if_invalid);
   }
 }
 
 // Child account status is refreshed through invalidations which are only
 // available for the primary account. Finding the primary account requires a
 // dependency on signin_manager which we get around by only allowing a single
 // account. This is possible since we only support a single account to be a
 // child anyway.
 void AccountFetcherService::UpdateChildInfo() {
   DCHECK(CalledOnValidThread());
   std::vector<std::string> accounts = token_service_->GetAccounts();
   if (accounts.size() == 1) {
     const std::string& candidate = accounts[0];
     if (candidate == child_request_account_id_)
       return;
     if (!child_request_account_id_.empty())
       ResetChildInfo();
     if (!AccountSupportsUserInfo(candidate))
       return;
+    if (DeferFetchingAccountInfo(candidate))
+      return;
     child_request_account_id_ = candidate;
     StartFetchingChildInfo(candidate);
   } else {
     ResetChildInfo();
   }
 }
 
 void AccountFetcherService::RefreshAllAccountsAndScheduleNext() {
   DCHECK(network_fetches_enabled_);
   RefreshAllAccountInfo(false);
@@ skipping 14 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 (DeferFetchingAccountInfo(account_id))
     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 116 matching lines @@
   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.
   RefreshAllAccountInfo(true);
   UpdateChildInfo();
 }
+
+bool AccountFetcherService::DeferFetchingAccountInfo(
+    const std::string& account_id) {
+  // There are two reasons for an account to be in |pending_user_info_fetches_|,
+  // either they were fetched before network fetch was enabled or the
+  // Id <-> Name mapping was required and unavailable for the account.
+  bool defer_fetch =
+      !network_fetches_enabled_ ||
+      (token_service_->GetDelegate()->NeedsAccountIdNameMap() &&
+       !account_tracker_service_->HasIdNameMappingForAccount(account_id));
+  if (defer_fetch)
+    pending_user_info_fetches_.insert(account_id);
+  return defer_fetch;
+}
+
+void AccountFetcherService::FetchPendingAccountInfo() {
+  // Since further failures will be added back, we create a new copy of the
+  // accounts list before processing it.
+  std::set<std::string> accounts_to_process;
+  pending_user_info_fetches_.swap(accounts_to_process);
+  for (const std::string& account : accounts_to_process) {
+    if (account_tracker_service_->IsTrackingAccount(account))
+      StartFetchingUserInfo(account);
+  }
+  UpdateChildInfo();
+}