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

chrome/browser/policy/cloud/user_policy_signin_service.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 "chrome/browser/policy/cloud/user_policy_signin_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 53 matching lines @@
   registration_helper_.reset();
 
   UserPolicySigninServiceBase::PrepareForUserCloudPolicyManagerShutdown();
 }
 
 void UserPolicySigninService::Shutdown() {
   UserPolicySigninServiceBase::Shutdown();
   oauth2_token_service_->RemoveObserver(this);
 }
 
-void UserPolicySigninService::RegisterForPolicy(
+void UserPolicySigninService::RegisterForPolicyWithLoginToken(
     const std::string& username,
     const std::string& oauth2_refresh_token,
     const PolicyRegistrationCallback& callback) {
   DCHECK(!oauth2_refresh_token.empty());
 
   // Create a new CloudPolicyClient for fetching the DMToken.
   std::unique_ptr<CloudPolicyClient> policy_client =
       CreateClientForRegistrationOnly(username);
   if (!policy_client) {
     callback.Run(std::string(), std::string());
     return;
   }
 
   // Fire off the registration process. Callback keeps the CloudPolicyClient
   // alive for the length of the registration process. Use the system
   // request context because the user is not signed in to this profile yet
   // (we are just doing a test registration to see if policy is supported for
   // this user).
-  registration_helper_.reset(new CloudPolicyClientRegistrationHelper(
+  registration_helper_ = base::MakeUnique<CloudPolicyClientRegistrationHelper>(
       policy_client.get(),
-      enterprise_management::DeviceRegisterRequest::BROWSER));
+      enterprise_management::DeviceRegisterRequest::BROWSER);
   registration_helper_->StartRegistrationWithLoginToken(
       oauth2_refresh_token,
       base::Bind(&UserPolicySigninService::CallPolicyRegistrationCallback,
                  base::Unretained(this),
                  base::Passed(&policy_client),
                  callback));
 }
 
+void UserPolicySigninService::RegisterForPolicyWithAccountId(
+    const std::string& username,
+    const std::string& account_id,
+    const PolicyRegistrationCallback& callback) {
+  DCHECK(!account_id.empty());
+
+  // Create a new CloudPolicyClient for fetching the DMToken.
+  std::unique_ptr<CloudPolicyClient> policy_client =
+      CreateClientForRegistrationOnly(username);
+  if (!policy_client) {
+    callback.Run(std::string(), std::string());
+    return;
+  }
+
+  // Fire off the registration process. Callback keeps the CloudPolicyClient
+  // alive for the length of the registration process. Use the system
+  // request context because the user is not signed in to this profile yet
+  // (we are just doing a test registration to see if policy is supported for
+  // this user).
+  registration_helper_ = base::MakeUnique<CloudPolicyClientRegistrationHelper>(
+      policy_client.get(),
+      enterprise_management::DeviceRegisterRequest::BROWSER);
+  registration_helper_->StartRegistration(
+      oauth2_token_service_, account_id,
+      base::Bind(&UserPolicySigninService::CallPolicyRegistrationCallback,
+                 base::Unretained(this), base::Passed(&policy_client),
+                 callback));
+}
+
 void UserPolicySigninService::CallPolicyRegistrationCallback(
     std::unique_ptr<CloudPolicyClient> client,
     PolicyRegistrationCallback callback) {
   registration_helper_.reset();
   callback.Run(client->dm_token(), client->client_id());
 }
 
 void UserPolicySigninService::OnRefreshTokenAvailable(
     const std::string& account_id) {
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
@@ skipping 85 matching lines @@
 }
 
 void UserPolicySigninService::ProhibitSignoutIfNeeded() {
   if (policy_manager()->IsClientRegistered()) {
     DVLOG(1) << "User is registered for policy - prohibiting signout";
     signin_manager()->ProhibitSignout(true);
   }
 }
 
 }  // namespace policy