Make sure GetAuthenticatedAccountId() returns a canonicalized id.

components/signin/core/browser/signin_manager_base.cc

Index: components/signin/core/browser/signin_manager_base.cc
diff --git a/components/signin/core/browser/signin_manager_base.cc b/components/signin/core/browser/signin_manager_base.cc
index 8d6f3096cb95b86231557acfa8c1c478d3d8824b..1e1a6898b4d0a4b6bde9a544b8b1830927aff529 100644
--- a/components/signin/core/browser/signin_manager_base.cc
+++ b/components/signin/core/browser/signin_manager_base.cc
@@ -41,16 +41,8 @@ void SigninManagerBase::Initialize(PrefService* local_state) {
 
   std::string user =
       client_->GetPrefs()->GetString(prefs::kGoogleServicesUsername);
-  if (!user.empty()) {
-#if defined(OS_IOS)
-    // Prior to M38, Chrome on iOS did not normalize the email before setting
-    // it in SigninManager. |AccountReconcilor| expects the authenticated email
-    // to be normalized as it used as an account identifier and is compared
-    // to the accounts available in the cookies.
-    user = gaia::CanonicalizeEmail(gaia::SanitizeEmail(user));
-#endif
+  if (!user.empty())
     SetAuthenticatedUsername(user);
-  }
 }
 
 bool SigninManagerBase::IsInitialized() const { return initialized_; }
@@ -59,12 +51,14 @@ bool SigninManagerBase::IsSigninAllowed() const {
   return client_->GetPrefs()->GetBoolean(prefs::kSigninAllowed);
 }
 
-const std::string& SigninManagerBase::GetAuthenticatedUsername() const {
+std::string SigninManagerBase::GetAuthenticatedUsername() const {
   return authenticated_username_;
 }
 
-const std::string& SigninManagerBase::GetAuthenticatedAccountId() const {
-  return GetAuthenticatedUsername();
+std::string SigninManagerBase::GetAuthenticatedAccountId() const {
+  return IsAuthenticated()
+      ? gaia::CanonicalizeEmail(gaia::SanitizeEmail(GetAuthenticatedUsername()))

[msarda, 2014/10/01 15:57:26]

I think this is potentially an expensive operation (a lot of string parsing). I
think it would be better to keep this in a field and update it at the same time
as authentication_username_. And that avoid changing the API as well.

[Roger Tawa OOO till Jul 10th, 2014/10/02 03:18:22]

Added new member, but left api as is.

+      : std::string();
 }
 
 void SigninManagerBase::SetAuthenticatedUsername(const std::string& username) {
@@ -105,7 +99,7 @@ void SigninManagerBase::clear_authenticated_username() {
 }
 
 bool SigninManagerBase::IsAuthenticated() const {
-  return !GetAuthenticatedAccountId().empty();
+  return !authenticated_username_.empty();
 }
 
 bool SigninManagerBase::AuthInProgress() const {