GAIA ID migration for Android

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"
@@ skipping 169 matching lines @@
 // static
 void StartFetchingAccountInfoFor(JNIEnv* env,
                                  const JavaParamRef<jclass>& clazz,
                                  const JavaParamRef<jobject>& jprofile,
                                  const JavaParamRef<jstring>& jemail,
                                  jint image_side_pixels,
                                  jboolean is_pre_signin) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
   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.
-  DCHECK_EQ(AccountTrackerService::MIGRATION_NOT_STARTED,
-            AccountTrackerServiceFactory::GetForProfile(profile)->
-                GetMigrationState());
-  AccountInfoRetriever* retriever =
-      new AccountInfoRetriever(
-          profile, gaia::CanonicalizeEmail(gaia::SanitizeEmail(email)), email,
-          image_side_pixels, is_pre_signin);
+  AccountTrackerService* account_tracker_service =
+      AccountTrackerServiceFactory::GetForProfile(profile);
+
+  AccountInfoRetriever* retriever = new AccountInfoRetriever(
+      profile,
+      account_tracker_service->FindAccountInfoByEmail(email).account_id, email,
+      image_side_pixels, is_pre_signin);
   retriever->Start();
 }
 
 // static
 bool RegisterProfileDownloader(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }