GAIA ID migration for Android

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 <vector>
 
 #include "chrome/browser/android/signin/signin_manager_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 85 matching lines @@
 
 SigninManagerAndroid::~SigninManagerAndroid() {}
 
 void SigninManagerAndroid::CheckPolicyBeforeSignIn(JNIEnv* env,
                                                    jobject obj,
                                                    jstring username) {
 #if defined(ENABLE_CONFIGURATION_POLICY)
   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
   // This shouldn't be called when ShouldLoadPolicyForUser() is false.
   NOTREACHED();
   base::android::ScopedJavaLocalRef<jstring> domain;
   Java_SigninManager_onPolicyCheckedBeforeSignIn(env,
                                                  java_signin_manager_.obj(),
                                                  domain.obj());
 #endif
@@ skipping 187 matching lines @@
   return !policy::BrowserPolicyConnector::IsNonEnterpriseUser(username);
 #else
   return false;
 #endif
 }
 
 // static
 bool SigninManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }