[DICE] Enable sync for an account that is already present in the token service.

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/callback_android.h"
 #include "base/android/jni_android.h"
@@ skipping 97 matching lines @@
 
 SigninManagerAndroid::~SigninManagerAndroid() {}
 
 void SigninManagerAndroid::CheckPolicyBeforeSignIn(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& username) {
   username_ = base::android::ConvertJavaStringToUTF8(env, username);
   policy::UserPolicySigninService* service =
       policy::UserPolicySigninServiceFactory::GetForProfile(profile_);
-  service->RegisterForPolicy(
-      username_, AccountTrackerServiceFactory::GetForProfile(profile_)
-                     ->FindAccountInfoByEmail(username_)
-                     .account_id,
+  service->RegisterForPolicyWithAccountId(
+      username_,
+      AccountTrackerServiceFactory::GetForProfile(profile_)
+          ->FindAccountInfoByEmail(username_)
+          .account_id,
       base::Bind(&SigninManagerAndroid::OnPolicyRegisterDone,
                  weak_factory_.GetWeakPtr()));
 }
 
 void SigninManagerAndroid::FetchPolicyBeforeSignIn(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   if (!dm_token_.empty()) {
     policy::UserPolicySigninService* service =
         policy::UserPolicySigninServiceFactory::GetForProfile(profile_);
@@ skipping 203 matching lines @@
     const JavaParamRef<jclass>& clazz,
     const JavaParamRef<jstring>& j_username,
     const JavaParamRef<jobject>& j_callback) {
   base::android::ScopedJavaGlobalRef<jobject> callback(env, j_callback);
 
   Profile* profile = ProfileManager::GetActiveUserProfile();
   std::string username =
       base::android::ConvertJavaStringToUTF8(env, j_username);
   policy::UserPolicySigninService* service =
       policy::UserPolicySigninServiceFactory::GetForProfile(profile);
-  service->RegisterForPolicy(
-      username, AccountTrackerServiceFactory::GetForProfile(profile)
-                     ->FindAccountInfoByEmail(username)
-                     .account_id,
+  service->RegisterForPolicyWithAccountId(
+      username,
+      AccountTrackerServiceFactory::GetForProfile(profile)
+          ->FindAccountInfoByEmail(username)
+          .account_id,
       base::Bind(&UserManagementDomainFetched, callback));
 }
 
 base::android::ScopedJavaLocalRef<jstring>
 ExtractDomainName(
     JNIEnv *env,
     const JavaParamRef<jclass>& clazz,
     const JavaParamRef<jstring>& j_email) {
   std::string email = base::android::ConvertJavaStringToUTF8(env, j_email);
   std::string domain = gaia::ExtractDomainName(email);
   return base::android::ConvertUTF8ToJavaString(env, domain);
 }
 
 // static
 bool SigninManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }