User cloud policy token forwarder: Replace PO2TS::GetPrimaryAccountId() with SMB::GetAuthenticatedAc

chrome/browser/signin/signin_manager_base.cc

Index: chrome/browser/signin/signin_manager_base.cc
diff --git a/chrome/browser/signin/signin_manager_base.cc b/chrome/browser/signin/signin_manager_base.cc
index fd24361ef5368e9246fbfedd22e6c16ccc84e2db..546973ea3f75219011d8e256e4168fb7e8e9e96c 100644
--- a/chrome/browser/signin/signin_manager_base.cc
+++ b/chrome/browser/signin/signin_manager_base.cc
@@ -89,11 +89,12 @@ void SigninManagerBase::SetAuthenticatedUsername(const std::string& username) {
     return;
 #endif
   }
+  std::string pref_username = profile_->GetPrefs()->GetString(
+      prefs::kGoogleServicesUsername);
+  DCHECK(pref_username.empty() ||
+      gaia::AreEmailsSame(username, pref_username));
   authenticated_username_ = username;
-  // TODO(tim): We could go further in ensuring kGoogleServicesUsername and
-  // authenticated_username_ are consistent once established (e.g. remove
-  // authenticated_username_ altogether). Bug 107160.
-
+  profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, username);
   NotifyDiagnosticsObservers(USERNAME, username);
 
   // Go ahead and update the last signed in username here as well. Once a