Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chrome/browser/signin/signin_manager_factory.cc

 // Copyright (c) 2012 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 "chrome/browser/signin/signin_manager_factory.h"
 
 #include "base/prefs/pref_registry_simple.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
@@ skipping 80 matching lines @@
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterInt64Pref(
       prefs::kGoogleServicesRefreshTokenAnnotateScheduledTime,
       base::Time().ToInternalValue(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(
       prefs::kGoogleServicesSigninScopedDeviceId,
       std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(
+      prefs::kGoogleServicesAccountId,
+      std::string(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(
       prefs::kGoogleServicesUserAccountId,
       std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kGoogleServicesUsername,
-      std::string(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kAutologinEnabled,
       true,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kReverseAutologinEnabled,
       true,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterListPref(prefs::kReverseAutologinRejectedEmailList,
                              new base::ListValue,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterInt64Pref(
       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
 void SigninManagerFactory::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterStringPref(prefs::kGoogleServicesUsernamePattern,
                                std::string());
 }
 
 void SigninManagerFactory::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void SigninManagerFactory::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void SigninManagerFactory::NotifyObserversOfSigninManagerCreationForTesting(
     SigninManagerBase* manager) {
   FOR_EACH_OBSERVER(Observer, observer_list_, SigninManagerCreated(manager));
 }
 
 KeyedService* SigninManagerFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   SigninManagerBase* service = NULL;
   Profile* profile = static_cast<Profile*>(context);
   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,
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
       AccountTrackerServiceFactory::GetForProfile(profile),
       GaiaCookieManagerServiceFactory::GetForProfile(profile));
 #endif
   service->Initialize(g_browser_process->local_state());
   FOR_EACH_OBSERVER(Observer, observer_list_, SigninManagerCreated(service));
   return service;
 }
 
 void SigninManagerFactory::BrowserContextShutdown(
     content::BrowserContext* context) {
   SigninManagerBase* manager = static_cast<SigninManagerBase*>(
       GetServiceForBrowserContext(context, false));
   if (manager)
     FOR_EACH_OBSERVER(Observer, observer_list_, SigninManagerShutdown(manager));
   BrowserContextKeyedServiceFactory::BrowserContextShutdown(context);
 }