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>
 
 #include "base/containers/scoped_ptr_hash_map.h"
+#include "base/memory/scoped_ptr.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 AccountSeedingTracker;
 class AccountTrackerService;
 class ChildAccountInfoFetcher;
 class OAuth2TokenService;
 class RefreshTokenAnnotationRequest;
 class SigninClient;
 
 namespace invalidation {
 class InvalidationService;
 }
 
@@ skipping 33 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)

[knn, 2015/10/05 14:11:45]

Can be removed.

+  // Android specific methods for keeping track of partially seeded accounts.
+  // Android uses email whereas Chrome uses GAIA ID. This mapping needs to be
+  // seeded before the AccountFetcherService can do anything.
+  void OnAccountsSeeded();
+
+  bool AreAllAccountsSeeded();
+#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.
@@ skipping 40 matching lines @@
   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_;
 
+  scoped_ptr<AccountSeedingTracker> account_seeding_tracker_;
+
   DISALLOW_COPY_AND_ASSIGN(AccountFetcherService);
 };
 
 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_FETCHER_SERVICE_H_