Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

components/signin/core/common/signin_pref_names.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/common/signin_pref_names.h"
 
 namespace prefs {
 
 // An integer property indicating the state of account id migration from
 // email to gaia id for the the profile.  See account_tracker_service.h
 // for possible values.
 const char kAccountIdMigrationState[] = "account_id_migration_state";
 
 // Boolean identifying whether reverse auto-login is enabled.
 const char kAutologinEnabled[] = "autologin.enabled";
 
+
 // The profile's hosted domain; empty if unset;
 // AccountTrackerService::kNoHostedDomainFound if there is none.
+
+const char kGoogleServicesAccountId[] = "google.services.account_id";
+
+// The profile's hosted domain; empty if unset; Profile::kNoHostedDomainFound
+// if there is none.
 const char kGoogleServicesHostedDomain[] = "google.services.hosted_domain";
 
 // String the identifies the last user that logged into sync and other
 // google services. As opposed to kGoogleServicesUsername, this value is not
 // cleared on signout, but while the user is signed in the two values will
-// be the same.
+// be the same.  This pref remains in order to pre-fill the sign in page when
+// reconnecting a profile, but programmatic checks to see if a given account
+// is the same as the last account should use kGoogleServicesLastAccountId
+// instead.
 const char kGoogleServicesLastUsername[] = "google.services.last_username";
 
 // Int64 as time from epoch of when next RefreshTokenAnnotationRequest should be
 // sent.
 const char kGoogleServicesRefreshTokenAnnotateScheduledTime[] =
     "google.services.refresh_token_annotate_scheduled_time";
 
 // Device id scoped to single signin. This device id will be regenerated if user
 // signs out and signs back in. When refresh token is requested for this user it
 // will be annotated with this device id.
 const char kGoogleServicesSigninScopedDeviceId[] =
     "google.services.signin_scoped_device_id";
 
 // Obfuscated account ID that identifies the current user logged into sync and
 // other google services.
 const char kGoogleServicesUserAccountId[] = "google.services.user_account_id";
 
 // String that identifies the current user logged into sync and other google
 // services.
+// DEPRECATED.
 const char kGoogleServicesUsername[] = "google.services.username";
 
 // Local state pref containing a string regex that restricts which accounts
 // can be used to log in to chrome (e.g. "*@google.com"). If missing or blank,
 // all accounts are allowed (no restrictions).
 const char kGoogleServicesUsernamePattern[] =
     "google.services.username_pattern";
 
 // Boolean identifying whether reverse auto-logins is enabled.
 const char kReverseAutologinEnabled[] = "reverse_autologin.enabled";
@@ skipping 14 matching lines @@
 // accounts.
 const char kTokenServiceExcludeAllSecondaryAccounts[] =
     "token_service.exclude_all_secondary_accounts";
 
 // List that identifies the account id that should be ignored by the token
 // service.
 const char kTokenServiceExcludedSecondaryAccounts[] =
     "token_service.excluded_secondary_accounts";
 
 }  // namespace prefs