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

chrome/browser/signin/signin_manager_base.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_base.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 71 matching lines @@
     // gaia::AreEmailsSame() but not the same as given by std::string::op==(),
     // make sure to set the authenticated name below.
     if (!gaia::AreEmailsSame(username, authenticated_username_) ||
         username == authenticated_username_) {
       return;
     }
 #else
     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
   // user is signed in the two preferences should match. Doing it here as
   // opposed to on signin allows us to catch the upgrade scenario.
   profile_->GetPrefs()->SetString(prefs::kGoogleServicesLastUsername, username);
 }
 
 void SigninManagerBase::clear_authenticated_username() {
   authenticated_username_.clear();
@@ skipping 33 matching lines @@
                     NotifySigninValueChanged(field, value));
 }
 
 void SigninManagerBase::NotifyDiagnosticsObservers(
     const TimedSigninStatusField& field,
     const std::string& value) {
   FOR_EACH_OBSERVER(SigninDiagnosticsObserver,
                     signin_diagnostics_observers_,
                     NotifySigninValueChanged(field, value));
 }