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

chrome/browser/policy/cloud/user_policy_signin_service_mobile.h

Index: chrome/browser/policy/cloud/user_policy_signin_service_mobile.h
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h b/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h
index c02437618f7ac8df84acb953fbb90976627d0dbd..d2bf6f817f1804874d7aa7efb0469d22c92b851a 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h
+++ b/chrome/browser/policy/cloud/user_policy_signin_service_mobile.h
@@ -27,8 +27,7 @@ namespace policy {
 
 class CloudPolicyClientRegistrationHelper;
 
-// A specialization of the UserPolicySigninServiceBase for the mobile platforms
-// (currently Android and iOS).
+// A specialization of the UserPolicySigninServiceBase for the Android.

[droger, 2017/06/26 09:17:50]

remove "the"

[msarda, 2017/06/27 09:06:19]

Done.

 class UserPolicySigninService : public UserPolicySigninServiceBase {
  public:
   // Creates a UserPolicySigninService associated with the passed |profile|.
@@ -49,11 +48,11 @@ class UserPolicySigninService : public UserPolicySigninServiceBase {
   // token services.
   // |callback| is invoked once we have registered this device to fetch policy,
   // or once it is determined that |username| is not a managed account.
-  void RegisterForPolicy(const std::string& username,
-                         const std::string& account_id,
-                         const PolicyRegistrationCallback& callback);
+  void RegisterForPolicyWithAccountId(
+      const std::string& username,
+      const std::string& account_id,
+      const PolicyRegistrationCallback& callback);
 
-#if !defined(OS_ANDROID)

[droger, 2017/06/26 09:17:50]

Should we delete this block instead? What platform is using this?

[msarda, 2017/06/27 09:06:19]

Done.

   // Registers a CloudPolicyClient for fetching policy for |username|.
   // This requires a valid OAuth access token for the scopes returned by the
   // |GetScopes| static function. |callback| is invoked once we have
@@ -66,7 +65,6 @@ class UserPolicySigninService : public UserPolicySigninServiceBase {
 
   // Returns the list of OAuth access scopes required for policy fetching.
   static std::vector<std::string> GetScopes();
-#endif
 
   // Overridden from UserPolicySigninServiceBase to cancel the pending delayed
   // registration.