Delay fetching account info until OnRefreshTokensLoaded().

components/signin/core/browser/account_fetcher_service.h

 // 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.
 
 #ifndef COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_FETCHER_SERVICE_H_
 #define COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_FETCHER_SERVICE_H_
 
-#include <list>
 #include <map>

[Roger Tawa OOO till Jul 10th, 2015/10/13 12:40:56]

Doesn't look like we need map anymore.

[knn, 2015/10/13 13:15:41]

Will remove.

+#include <set>
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer/timer.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
 class AccountInfoFetcher;
 class AccountTrackerService;
 class ChildAccountInfoFetcher;
@@ skipping 41 matching lines @@
 
   void FetchUserInfoBeforeSignin(const std::string& account_id);
 
   AccountTrackerService* account_tracker_service() const {
     return account_tracker_service_;
   }
 
   // Called by ChildAccountInfoFetcher.
   void SetIsChildAccount(const std::string& account_id, bool is_child_account);
 
+#if defined(OS_ANDROID)
+  // Called by AccountTrackerServiceAndroid.
+  void OnAccountIdNameMapSeeded();
+#endif
+
  private:
   friend class AccountInfoFetcher;
   friend class ChildAccountInfoFetcherImpl;
 
   void RefreshAllAccountInfo(bool only_fetch_if_invalid);
   void RefreshAllAccountsAndScheduleNext();
   void ScheduleNextRefresh();
 
   // Called on all account state changes. Decides whether to fetch new child
   // status information or reset old values that aren't valid now.
   void UpdateChildInfo();
 
   // Virtual so that tests can override the network fetching behaviour.
   // Further the two fetches are managed by a different refresh logic and
   // thus, can not be combined.
   virtual void StartFetchingUserInfo(const std::string& account_id);
   virtual void StartFetchingChildInfo(const std::string& account_id);
 
+  // Helper methods to defer fetching until it is enabled and any partial
+  // seeding has been done if it is required (Android).
+  bool CanFetchAccountInfo(const std::string& account_id);
+  void FetchPendingAccountInfo();
+
   // If there is more than one account in a profile, we forcibly reset the
   // child status for an account to be false.
   void ResetChildInfo();
 
   // Refreshes the AccountInfo associated with |account_id|.
   void RefreshAccountInfo(const std::string& account_id,
                           bool only_fetch_if_invalid);
 
   // Virtual so that tests can override the network fetching behaviour.
   virtual void SendRefreshTokenAnnotationRequest(const std::string& account_id);
   void RefreshTokenAnnotationRequestDone(const std::string& account_id);
 
   // Called by AccountInfoFetcher.
   void OnUserInfoFetchSuccess(const std::string& account_id,
                               scoped_ptr<base::DictionaryValue> user_info);
   void OnUserInfoFetchFailure(const std::string& account_id);
 
   // OAuth2TokenService::Observer implementation.
   void OnRefreshTokenAvailable(const std::string& account_id) override;
   void OnRefreshTokenRevoked(const std::string& account_id) override;
   void OnRefreshTokensLoaded() override;
 
   AccountTrackerService* account_tracker_service_;  // Not owned.
   OAuth2TokenService* token_service_;  // Not owned.
   SigninClient* signin_client_;  // Not owned.
   invalidation::InvalidationService* invalidation_service_;  // Not owned.
   bool network_fetches_enabled_;
-  std::list<std::string> pending_user_info_fetches_;
+  std::set<std::string> pending_user_info_fetches_;
   base::Time last_updated_;
   base::OneShotTimer timer_;
   bool shutdown_called_;
 
   std::string child_request_account_id_;
   scoped_ptr<ChildAccountInfoFetcher> child_info_request_;
 
   // Holds references to account info fetchers keyed by account_id.
   base::ScopedPtrHashMap<std::string, scoped_ptr<AccountInfoFetcher>>
       user_info_requests_;
   // Holds references to refresh token annotation requests keyed by account_id.
   base::ScopedPtrHashMap<std::string, scoped_ptr<RefreshTokenAnnotationRequest>>
       refresh_token_annotation_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(AccountFetcherService);
 };
 
 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_FETCHER_SERVICE_H_