Reflect email address changes in the Avatar Menu.

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 37 matching lines @@
     "account_tracker_service_last_update";
 
 // AccountFetcherService implementation
 AccountFetcherService::AccountFetcherService()
     : account_tracker_service_(nullptr),
       token_service_(nullptr),
       signin_client_(nullptr),
       invalidation_service_(nullptr),
       network_fetches_enabled_(false),
       shutdown_called_(false),
+      refresh_required_on_load_(false),
       child_info_request_(nullptr) {}
 
 AccountFetcherService::~AccountFetcherService() {
   DCHECK(shutdown_called_);
 }
 
 // static
 void AccountFetcherService::RegisterPrefs(
     user_prefs::PrefRegistrySyncable* user_prefs) {
   user_prefs->RegisterInt64Pref(kLastUpdatePref, 0);
@@ skipping 93 matching lines @@
                                        last_updated_.ToInternalValue());
   ScheduleNextRefresh();
 }
 
 void AccountFetcherService::ScheduleNextRefresh() {
   DCHECK(!timer_.IsRunning());
   DCHECK(network_fetches_enabled_);
 
   const base::TimeDelta time_since_update = base::Time::Now() - last_updated_;
   if(time_since_update > kRefreshFromTokenServiceDelay) {
-    RefreshAllAccountsAndScheduleNext();
+    // The service is due for a refresh but the TokenService isn't ready at this
+    // point so |refresh_required_on_load_| is set to make sure we update all
+    // the accounts in OnRefreshTokensLoaded().
+    refresh_required_on_load_ = true;
   } else {
     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) {
@@ skipping 128 matching lines @@
 
   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.
-  RefreshAllAccountInfo(true);
+  RefreshAllAccountInfo(!refresh_required_on_load_);
   UpdateChildInfo();
 }