patch from issue 473153002

components/signin/core/browser/account_tracker_service.cc

 // 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.
 
 #include "components/signin/core/browser/account_tracker_service.h"
 
 #include "base/debug/trace_event.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 424 matching lines @@
   }
 }
 
 void AccountTrackerService::LoadFromTokenService() {
   std::vector<std::string> accounts = token_service_->GetAccounts();
   for (std::vector<std::string>::const_iterator it = accounts.begin();
        it != accounts.end(); ++it) {
     OnRefreshTokenAvailable(*it);
   }
 }
+
+std::string AccountTrackerService::PickAccountIdForAccount(
+    const std::string& gaia_id,
+    const std::string& email) {
+  return PickAccountIdForAccount(pref_service_, gaia_id, email);
+}
+
+// static
+std::string AccountTrackerService::PickAccountIdForAccount(
+    PrefService* pref_service,
+    const std::string& gaia_id,
+    const std::string& email) {
+  DCHECK(!gaia_id.empty());
+  DCHECK(!email.empty());
+  switch(GetMigrationState(pref_service)) {
+    case MIGRATION_NOT_STARTED:
+    case MIGRATION_IN_PROGRESS:
+      return email;
+    case MIGRATION_DONE:
+      return gaia_id;
+    default:
+      NOTREACHED();
+      return email;
+  }
+}
+
+void AccountTrackerService::SeedAccountInfo(const std::string& account_id,
+                                            const std::string& gaia,
+                                            const std::string& email) {
+  DCHECK(!account_id.empty());
+  DCHECK(!gaia.empty());
+  DCHECK(!email.empty());
+  bool already_exists = ContainsKey(accounts_, account_id);
+  StartTrackingAccount(account_id);
+  AccountState& state = accounts_[account_id];
+  DCHECK(!already_exists || state.info.gaia == gaia);
+  state.info.gaia = gaia;
+  state.info.email = email;
+  SaveToPrefs(state);
+
+}