GAIA ID migration for Android

chrome/browser/android/signin/signin_manager_android.cc

Index: chrome/browser/android/signin/signin_manager_android.cc
diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc
index d11e1adb0b409483ae392245111f4f2d5091b0ea..344396486fe9a67a119555258c368475fea41f96 100644
--- a/chrome/browser/android/signin/signin_manager_android.cc
+++ b/chrome/browser/android/signin/signin_manager_android.cc
@@ -103,8 +103,13 @@ void SigninManagerAndroid::CheckPolicyBeforeSignIn(JNIEnv* env,
   username_ = base::android::ConvertJavaStringToUTF8(env, username);
   policy::UserPolicySigninService* service =
       policy::UserPolicySigninServiceFactory::GetForProfile(profile_);
+  std::string account_id = AccountTrackerServiceFactory::GetForProfile(profile_)
+                               ->FindAccountInfoByEmail(username_)
+                               .account_id;
+  if (account_id.empty())
+    account_id = username_;

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

Under what cases would we want to use username as account_id?  Before migration,
account_id is already an email, no need to copy.  During or after migration,
using username as account_id will not work.

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

In this simple solution, services may need OAuth2TokenService before ATS is
seeded (pre-signin). Not the case in full solution.

   service->RegisterForPolicy(
-      base::android::ConvertJavaStringToUTF8(env, username),
+      username_, account_id,
       base::Bind(&SigninManagerAndroid::OnPolicyRegisterDone,
                  weak_factory_.GetWeakPtr()));
 #else