Delay fetching account info until OnRefreshTokensLoaded().

components/signin/core/browser/account_fetcher_service.h

Index: components/signin/core/browser/account_fetcher_service.h
diff --git a/components/signin/core/browser/account_fetcher_service.h b/components/signin/core/browser/account_fetcher_service.h
index f0d6386afaf4f8b0384cb912ec8ba8669e919464..9f7dd1094bff5aa9c9c6e4a76a04bb6eba1a0c4a 100644
--- a/components/signin/core/browser/account_fetcher_service.h
+++ b/components/signin/core/browser/account_fetcher_service.h
@@ -9,12 +9,14 @@
 #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;
@@ -68,6 +70,15 @@ class AccountFetcherService : public KeyedService,
   // Called by ChildAccountInfoFetcher.
   void SetIsChildAccount(const std::string& account_id, bool is_child_account);
 
+#if defined(OS_ANDROID)
+  // 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;
@@ -128,6 +139,8 @@ class AccountFetcherService : public KeyedService,
   base::ScopedPtrHashMap<std::string, scoped_ptr<RefreshTokenAnnotationRequest>>
       refresh_token_annotation_requests_;
 
+  scoped_ptr<AccountSeedingTracker> account_seeding_tracker_;
+
   DISALLOW_COPY_AND_ASSIGN(AccountFetcherService);
 };