Make sure GetAuthenticatedAccountId() returns a canonicalized id.

chrome/browser/sync/supervised_user_signin_manager_wrapper.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 "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "google_apis/gaia/gaia_constants.h"
 
 #if defined(ENABLE_MANAGED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
 #endif
 
 SupervisedUserSigninManagerWrapper::SupervisedUserSigninManagerWrapper(
     Profile* profile,
     SigninManagerBase* original)
     : profile_(profile), original_(original) {}
 
 SupervisedUserSigninManagerWrapper::~SupervisedUserSigninManagerWrapper() {
 }
 
 SigninManagerBase* SupervisedUserSigninManagerWrapper::GetOriginal() {
   return original_;
 }
 
 std::string SupervisedUserSigninManagerWrapper::GetEffectiveUsername() const {
-  const std::string& auth_username = original_->GetAuthenticatedUsername();
+  std::string auth_username = original_->GetAuthenticatedUsername();
 #if defined(ENABLE_MANAGED_USERS)
-  if (auth_username.empty() && profile_->IsSupervised())
+  if (!original_->IsAuthenticated() && profile_->IsSupervised())
     return supervised_users::kSupervisedUserPseudoEmail;
 #endif
-  return auth_username;
+  return original_->GetAuthenticatedUsername();
 }
 
 std::string SupervisedUserSigninManagerWrapper::GetAccountIdToUse() const {
 #if defined(ENABLE_MANAGED_USERS)
   if (!original_->IsAuthenticated() && profile_->IsSupervised())
     return supervised_users::kSupervisedUserPseudoEmail;
 #endif
   return original_->GetAuthenticatedAccountId();
 }
 
 std::string SupervisedUserSigninManagerWrapper::GetSyncScopeToUse() const {
 #if defined(ENABLE_MANAGED_USERS)
   if (!original_->IsAuthenticated() && profile_->IsSupervised())
     return GaiaConstants::kChromeSyncSupervisedOAuth2Scope;
 #endif
   return GaiaConstants::kChromeSyncOAuth2Scope;
 }