Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

components/signin/core/common/signin_pref_names.cc

Index: components/signin/core/common/signin_pref_names.cc
diff --git a/components/signin/core/common/signin_pref_names.cc b/components/signin/core/common/signin_pref_names.cc
index 4e4b87e3080a1f2758d2c8a14720ecc1748e6b85..2e3c1cf0664d89802f65e04de4bd852f47a911dc 100644
--- a/components/signin/core/common/signin_pref_names.cc
+++ b/components/signin/core/common/signin_pref_names.cc
@@ -14,14 +14,29 @@ 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.
+const char kGoogleServicesLastAccountId[] = "google.services.last_account_id";
+
+// 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.  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
@@ -41,6 +56,7 @@ 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