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

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 c2d759363d652df5bdfa39ac19cc60d703dbed67..e9bc7433543b1235acd45896c489c1eb2ef1d7ae 100644
--- a/chrome/browser/android/signin/signin_manager_android.cc
+++ b/chrome/browser/android/signin/signin_manager_android.cc
@@ -115,10 +115,11 @@ void SigninManagerAndroid::CheckPolicyBeforeSignIn(
   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()));
 }
@@ -342,10 +343,11 @@ static void IsUserManaged(
       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));
 }