patch from issue 473153002

components/signin/core/browser/account_tracker_service.h

 // Copyright 2014 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_TRACKER_SERVICE_H_
 #define COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_TRACKER_SERVICE_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 61 matching lines @@
   // have been fetched.
   std::vector<AccountInfo> GetAccounts() const;
   AccountInfo GetAccountInfo(const std::string& account_id);
   AccountInfo FindAccountInfoByGaiaId(const std::string& gaia_id);
   AccountInfo FindAccountInfoByEmail(const std::string& email);
 
   // Indicates if all user information has been fetched. If the result is false,
   // 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);
 
  private:
   friend class AccountInfoFetcher;
 
   // These methods are called by fetchers.
   void OnUserInfoFetchSuccess(AccountInfoFetcher* fetcher,
                               const base::DictionaryValue* user_info);
   void OnUserInfoFetchFailure(AccountInfoFetcher* fetcher);
@@ skipping 28 matching lines @@
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
   std::map<std::string, AccountInfoFetcher*> user_info_requests_;
   std::map<std::string, AccountState> accounts_;
   ObserverList<Observer> observer_list_;
   bool shutdown_called_;
 
   DISALLOW_COPY_AND_ASSIGN(AccountTrackerService);
 };
 
 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_TRACKER_SERVICE_H_