Make sure GetAuthenticatedAccountId() returns a canonicalized id.

chrome/browser/android/signin/signin_manager_android.cc

 // Copyright 2013 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/android/signin/signin_manager_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 221 matching lines @@
 
 void SigninManagerAndroid::LogInSignedInUser(JNIEnv* env, jobject obj) {
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(profile_);
   if (switches::IsNewProfileManagement()) {
     // New Mirror code path that just fires the events and let the
     // Account Reconcilor handles everything.
     AndroidProfileOAuth2TokenService* token_service =
         ProfileOAuth2TokenServiceFactory::GetPlatformSpecificForProfile(
             profile_);
-    const std::string& primary_acct =
-        signin_manager->GetAuthenticatedAccountId();
+    std::string primary_acct = signin_manager->GetAuthenticatedAccountId();
     token_service->ValidateAccounts(primary_acct, true);
 
   } else {
     DVLOG(1) << "SigninManagerAndroid::LogInSignedInUser "
         " Manually calling MergeSessionHelper";
     // Old code path that doesn't depend on the new Account Reconcilor.
     // We manually login.
 
     ProfileOAuth2TokenService* token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
@@ skipping 34 matching lines @@
 }
 
 static jboolean IsNewProfileManagementEnabled(JNIEnv* env, jclass clazz) {
   return switches::IsNewProfileManagement();
 }
 
 // static
 bool SigninManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }