Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chrome/browser/signin/signin_manager_factory.cc

Index: chrome/browser/signin/signin_manager_factory.cc
diff --git a/chrome/browser/signin/signin_manager_factory.cc b/chrome/browser/signin/signin_manager_factory.cc
index f7f828e43f84a0cfb6664ee693d5023945e17d28..aa53446fd5c4906ecfec2dcf5c48c02493bd7017 100644
--- a/chrome/browser/signin/signin_manager_factory.cc
+++ b/chrome/browser/signin/signin_manager_factory.cc
@@ -98,11 +98,15 @@ void SigninManagerFactory::RegisterProfilePrefs(
       std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(
-      prefs::kGoogleServicesUserAccountId,
+      prefs::kGoogleServicesAccountId,
       std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(
-      prefs::kGoogleServicesUsername,
+      prefs::kGoogleServicesLastAccountId,
+      std::string(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(
+      prefs::kGoogleServicesUserAccountId,
       std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
@@ -120,7 +124,14 @@ void SigninManagerFactory::RegisterProfilePrefs(
       prefs::kSignedInTime,
       base::Time().ToInternalValue(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+
   LocalAuth::RegisterLocalAuthPrefs(registry);
+
+  // Deprecated prefs: will be removed in a future release.
+  registry->RegisterStringPref(
+      prefs::kGoogleServicesUsername,
+      std::string(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 // static
@@ -149,7 +160,9 @@ KeyedService* SigninManagerFactory::BuildServiceInstanceFor(
   SigninClient* client =
       ChromeSigninClientFactory::GetInstance()->GetForProfile(profile);
 #if defined(OS_CHROMEOS)
-  service = new SigninManagerBase(client);
+  service = new SigninManagerBase(
+      client,
+      AccountTrackerServiceFactory::GetForProfile(profile));
 #else
   service = new SigninManager(
       client,