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

chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc

 // Copyright (c) 2012 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 <memory>
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 102 matching lines @@
                            const std::string& client_id) {
     register_completed_ = true;
     dm_token_ = dm_token;
     client_id_ = client_id;
   }
 
   void RegisterPolicyClientWithCallback(UserPolicySigninService* service) {
     // Policy client registration on Android depends on Token Service having
     // a valid login token, while on other platforms, the login refresh token
     // is specified directly.
+    UserPolicySigninServiceBase::PolicyRegistrationCallback callback =
+        base::Bind(&UserPolicySigninServiceTest::OnRegisterCompleted,
+                   base::Unretained(this));
 #if defined(OS_ANDROID)
     GetTokenService()->UpdateCredentials(
         AccountTrackerService::PickAccountIdForAccount(
             profile_.get()->GetPrefs(), kTestGaiaId, kTestUser),
         "oauth2_login_refresh_token");
+    service->RegisterForPolicyWithAccountId(kTestUser, kTestGaiaId, callback);
+#else
+    service->RegisterForPolicyWithLoginToken(kTestUser, "mock_oauth_token",
+                                             callback);
 #endif
-    service->RegisterForPolicy(
-        kTestUser,
-#if defined(OS_ANDROID)
-        kTestGaiaId,
-#else
-        "mock_oauth_token",
-#endif
-        base::Bind(&UserPolicySigninServiceTest::OnRegisterCompleted,
-                   base::Unretained(this)));
     ASSERT_TRUE(IsRequestActive());
   }
 
   void SetUp() override {
     UserPolicySigninServiceFactory::SetDeviceManagementServiceForTesting(
         &device_management_service_);
 
     local_state_.reset(new TestingPrefServiceSimple);
     chrome::RegisterLocalState(local_state_->registry());
     system_request_context_getter_ = new net::TestURLRequestContextGetter(
@@ skipping 673 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(manager_->IsClientRegistered());
 #if !defined(OS_ANDROID)
   EXPECT_FALSE(signin_manager_->IsSignoutProhibited());
 #endif
 }
 
 }  // namespace
 
 }  // namespace policy