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 167 matching lines @@
 void StartFetchingAccountInfoFor(
     JNIEnv* env,
     jclass clazz,
     jobject jprofile,
     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);
+
+  std::string account_id = gaia::CanonicalizeEmail(gaia::SanitizeEmail(email));
+  AccountTrackerService* account_tracker_service =
+      AccountTrackerServiceFactory::GetForProfile(profile);
+  if (account_tracker_service->GetMigrationState() !=
+      AccountTrackerService::MIGRATION_NOT_STARTED) {
+    std::string accountid =

[Roger Tawa OOO till Jul 10th, 2015/08/12 15:28:46]

This variable name is too similar with account_id.  I'd suggest something like
account_id_from_tracker.

[gogerald1, 2015/08/13 18:12:12]

Acknowledged.

+        account_tracker_service->FindAccountInfoByEmail(email).gaia;

[Roger Tawa OOO till Jul 10th, 2015/08/12 15:28:46]

If migration state != NOT_STARTED, then FindAccountInfoByEmail() *MUST* return a
non-empty account_id.  When does it not do so?  Seems like we should DCHECK.

[gogerald1, 2015/08/13 18:12:12]

Done.

+    if (!accountid.empty())
+      account_id = accountid;
+  }
+
+  AccountInfoRetriever* retriever = new AccountInfoRetriever(
+      profile, account_id, email, image_side_pixels, is_pre_signin);
   retriever->Start();
 }
 
 // static
 bool RegisterProfileDownloader(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }