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

chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc

 // Copyright 2014 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_mobile.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/location.h"
@@ skipping 44 matching lines @@
                                   policy_manager,
                                   signin_manager,
                                   system_request_context),
       oauth2_token_service_(token_service),
       profile_prefs_(profile->GetPrefs()),
       weak_factory_(this) {
 }
 
 UserPolicySigninService::~UserPolicySigninService() {}
 
-void UserPolicySigninService::RegisterForPolicy(
-    const std::string& username,
-    const std::string& account_id,
-    const PolicyRegistrationCallback& callback) {
-  RegisterForPolicyInternal(username, account_id, "", callback);
-}
-
-#if !defined(OS_ANDROID)
-void UserPolicySigninService::RegisterForPolicyWithAccessToken(
-    const std::string& username,
-    const std::string& access_token,
-    const PolicyRegistrationCallback& callback) {
-  RegisterForPolicyInternal(username, "", access_token, callback);
-}
-
-// static
-std::vector<std::string> UserPolicySigninService::GetScopes() {
-  return CloudPolicyClientRegistrationHelper::GetScopes();
-}
-#endif
-
 void UserPolicySigninService::ShutdownUserCloudPolicyManager() {
   CancelPendingRegistration();
   UserPolicySigninServiceBase::ShutdownUserCloudPolicyManager();
 }
 
-void UserPolicySigninService::RegisterForPolicyInternal(
+void UserPolicySigninService::RegisterForPolicyWithAccountId(
     const std::string& username,
     const std::string& account_id,
-    const std::string& access_token,
     const PolicyRegistrationCallback& callback) {
   // 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;
   }
 
   CancelPendingRegistration();
 
   // Fire off the registration process. Callback keeps the CloudPolicyClient
   // alive for the length of the registration process.
   registration_helper_.reset(new CloudPolicyClientRegistrationHelper(
       policy_client.get(),
       kCloudPolicyRegistrationType));
 
   // Using a raw pointer to |this| is okay, because we own the
   // |registration_helper_|.
   auto registration_callback = base::Bind(
       &UserPolicySigninService::CallPolicyRegistrationCallback,
       base::Unretained(this), base::Passed(&policy_client), callback);
-  if (access_token.empty()) {
-    registration_helper_->StartRegistration(
-        oauth2_token_service_, account_id, registration_callback);
-  } else {
-#if defined(OS_ANDROID)
-    NOTREACHED();
-#else
-    registration_helper_->StartRegistrationWithAccessToken(
-        access_token, registration_callback);
-#endif
-  }
+  registration_helper_->StartRegistration(oauth2_token_service_, account_id,
+                                          registration_callback);
 }
 
 void UserPolicySigninService::CallPolicyRegistrationCallback(
     std::unique_ptr<CloudPolicyClient> client,
     PolicyRegistrationCallback callback) {
   registration_helper_.reset();
   callback.Run(client->dm_token(), client->client_id());
 }
 
 void UserPolicySigninService::Shutdown() {
@@ skipping 66 matching lines @@
 void UserPolicySigninService::CancelPendingRegistration() {
   weak_factory_.InvalidateWeakPtrs();
   registration_helper_.reset();
 }
 
 void UserPolicySigninService::OnRegistrationDone() {
   registration_helper_.reset();
 }
 
 }  // namespace policy