patch from issue 473153002

components/signin/core/browser/account_tracker_service.h

Index: components/signin/core/browser/account_tracker_service.h
diff --git a/components/signin/core/browser/account_tracker_service.h b/components/signin/core/browser/account_tracker_service.h
index 68cf723d2acdc280c7baa66d02c25e24b48e2fdc..00553443ca7c47e4a15455f098b39926ff577066 100644
--- a/components/signin/core/browser/account_tracker_service.h
+++ b/components/signin/core/browser/account_tracker_service.h
@@ -79,6 +79,19 @@ class AccountTrackerService : public KeyedService,
   // there are still unfininshed fetchers.
   virtual bool IsAllUserInfoFetched() const;
 
+  // Picks the corect account_id for the specified account depending on the
+  // migration state.
+  std::string PickAccountIdForAccount(const std::string& gaia_id,
+                                      const std::string& email);
+  static std::string PickAccountIdForAccount(PrefService* pref_service,
+                                             const std::string& gaia_id,
+                                             const std::string& email);
+
+  // Seed the gaia id and email for the given account_id.
+  void SeedAccountInfo(const std::string& account_id,
+                       const std::string& gaia,
+                       const std::string& email);
+
   AccountIdMigrationState GetMigrationState();
   static AccountIdMigrationState GetMigrationState(PrefService* pref_service);