Make sure GetAuthenticatedAccountId() returns a canonicalized id.

chrome/browser/android/profiles/profile_downloader_android.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/android/profiles/profile_downloader_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_downloader.h"
 #include "chrome/browser/profiles/profile_downloader_delegate.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "google_apis/gaia/gaia_auth_util.h"
 #include "jni/ProfileDownloader_jni.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 
 namespace {
 
 // An account fetcher callback.
 class AccountInfoRetriever : public ProfileDownloaderDelegate {
  public:
   explicit AccountInfoRetriever(Profile* profile,
                                 const std::string& account_id,
+                                const std::string& email,
                                 const int desired_image_side_pixels)
       : profile_(profile),
         account_id_(account_id),
+        email_(email),
         desired_image_side_pixels_(desired_image_side_pixels) {}
 
   void Start() {
     profile_image_downloader_.reset(new ProfileDownloader(this));
     profile_image_downloader_->StartForAccount(account_id_);
   }
 
   void Shutdown() {
     profile_image_downloader_.reset();
     delete this;
@@ skipping 12 matching lines @@
     return profile_;
   }
 
   virtual std::string GetCachedPictureURL() const OVERRIDE {
     return std::string();
   }
 
   virtual void OnProfileDownloadSuccess(
       ProfileDownloader* downloader) OVERRIDE {
     ProfileDownloaderAndroid::OnProfileDownloadSuccess(
-        account_id_,
+        email_,
         downloader->GetProfileFullName(),
         downloader->GetProfilePicture());
     Shutdown();
   }
 
   virtual void OnProfileDownloadFailure(
       ProfileDownloader* downloader,
       ProfileDownloaderDelegate::FailureReason reason) OVERRIDE {
     LOG(ERROR) << "Failed to download the profile information: " << reason;
     Shutdown();
   }
 
   // The profile image downloader instance.
   scoped_ptr<ProfileDownloader> profile_image_downloader_;
 
   // The browser profile associated with this download request.
   Profile* profile_;
 
-  // The account ID (email address) to be loaded.
+  // The account ID and email address of account to be loaded.
   const std::string account_id_;
+  const std::string email_;
 
   // Desired side length of the profile image (in pixels).
   const int desired_image_side_pixels_;
 
   DISALLOW_COPY_AND_ASSIGN(AccountInfoRetriever);
 };
 
 }  // namespace
 
 // static
@@ skipping 49 matching lines @@
   }
 
   return jbitmap.Release();
 }
 
 // static
 void StartFetchingAccountInfoFor(
     JNIEnv* env,
     jclass clazz,
     jobject jprofile,
-    jstring jaccount_id,
+    jstring jemail,
     jint image_side_pixels) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
-  const std::string account_id =
-      base::android::ConvertJavaStringToUTF8(env, jaccount_id);
+  const std::string email =
+      base::android::ConvertJavaStringToUTF8(env, jemail);
+  // TODO(rogerta): the java code will need to pass in the gaia-id
+  // of the account instead of the email when chrome uses gaia-id as key.
   AccountInfoRetriever* retriever =
-      new AccountInfoRetriever(profile, account_id, image_side_pixels);
+      new AccountInfoRetriever(profile, gaia::CanonicalizeEmail(email), email,
+                               image_side_pixels);

[guohui, 2014/10/07 04:06:03]

it may be better to add a DCHECK for AccountTrackerService::GetMigrationState,
so that later you wont forget to update this code.

[Roger Tawa OOO till Jul 10th, 2014/10/07 21:38:30]

Done.

   retriever->Start();
 }
 
 // static
 bool ProfileDownloaderAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }