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 86 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_);
   service->RegisterForPolicy(
-      base::android::ConvertJavaStringToUTF8(env, username),
+      username_, AccountTrackerServiceFactory::GetForProfile(profile_)
+                     ->FindAccountInfoByEmail(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 18 matching lines @@
 #endif
   // This shouldn't be called when ShouldLoadPolicyForUser() is false, or when
   // CheckPolicyBeforeSignIn() failed.
   NOTREACHED();
   Java_SigninManager_onPolicyFetchedBeforeSignIn(env,
                                                  java_signin_manager_.obj());
 }
 
 void SigninManagerAndroid::OnSignInCompleted(JNIEnv* env,
                                              jobject obj,
-                                             jstring username,
-                                             jobjectArray accountIds,
-                                             jobjectArray accountNames) {
+                                             jstring username) {
   DVLOG(1) << "SigninManagerAndroid::OnSignInCompleted";
-  // Seed the account tracker with id/email information if provided.
-  DCHECK(accountIds && accountNames);
-  std::vector<std::string> gaia_ids;
-  std::vector<std::string> emails;
-  base::android::AppendJavaStringArrayToStringVector(env, accountIds,
-                                                     &gaia_ids);
-  base::android::AppendJavaStringArrayToStringVector(env, accountNames,
-                                                     &emails);
-  DCHECK_EQ(emails.size(), gaia_ids.size());
-  DVLOG(1) << "SigninManagerAndroid::OnSignInCompleted: seeding "
-           << emails.size() << " accounts";
-
-  AccountTrackerService* tracker =
-      AccountTrackerServiceFactory::GetForProfile(profile_);
-  for (size_t i = 0; i < emails.size(); ++i) {
-    DVLOG(1) << "SigninManagerAndroid::OnSignInCompleted: seeding"
-             << " gaia_id=" << gaia_ids[i] << " email=" << emails[i];
-    if (!gaia_ids[i].empty() && !emails[i].empty())
-      tracker->SeedAccountInfo(gaia_ids[i], emails[i]);
-  }
-
   SigninManagerFactory::GetForProfile(profile_)->OnExternalSigninCompleted(
       base::android::ConvertJavaStringToUTF8(env, username));
 }
 
 void SigninManagerAndroid::SignOut(JNIEnv* env, jobject obj) {
   SigninManagerFactory::GetForProfile(profile_)->SignOut(
       signin_metrics::USER_CLICKED_SIGNOUT_SETTINGS);
 }
 
 base::android::ScopedJavaLocalRef<jstring>
@@ skipping 119 matching lines @@
   return !policy::BrowserPolicyConnector::IsNonEnterpriseUser(username);
 #else
   return false;
 #endif
 }
 
 // static
 bool SigninManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }