Split UserCloudPolicyManager implementation.

chrome/browser/policy/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/user_policy_signin_service.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud_policy_service.h"
 #include "chrome/browser/policy/user_cloud_policy_manager.h"
@@ skipping 111 matching lines @@
       // Make sure we've initialized the DeviceManagementService. It's OK to
       // call this multiple times so we do it every time we initialize the
       // UserCloudPolicyManager.
       g_browser_process->browser_policy_connector()->
           ScheduleServiceInitialization(
               kPolicyServiceInitializationDelayMilliseconds);
       // If there is no cached DMToken then we can detect this below (or when
       // the OnInitializationCompleted() callback is invoked.
       policy::DeviceManagementService* service = g_browser_process->
           browser_policy_connector()->device_management_service();
-      manager_->Initialize(g_browser_process->local_state(),
-                           service,
-                           policy::USER_AFFILIATION_NONE);
+      manager_->Initialize(g_browser_process->local_state(), service);
       DCHECK(manager_->cloud_policy_service());
       manager_->cloud_policy_service()->AddObserver(this);
     }
 
     // If the CloudPolicyService is initialized, but the CloudPolicyClient still
     // needs to be registered, kick off registration.
     if (manager_->cloud_policy_service()->IsInitializationComplete() &&
         !manager_->IsClientRegistered()) {
       RegisterCloudPolicyService();
     }
@@ skipping 39 matching lines @@
       gaia_urls->oauth2_chrome_client_secret(),
       token,
       scopes);
 }
 
 void UserPolicySigninService::OnGetTokenFailure(
     const GoogleServiceAuthError& error) {
   DLOG(WARNING) << "Could not fetch access token for "
                 << kServiceScopeChromeOSDeviceManagement;
   oauth2_access_token_fetcher_.reset();
-  manager_->CancelWaitForPolicyFetch();
 }
 
 void UserPolicySigninService::OnGetTokenSuccess(
     const std::string& access_token,
     const base::Time& expiration_time) {
   // Pass along the new access token to the CloudPolicyClient.
   DVLOG(1) << "Fetched new scoped OAuth token:" << access_token;
   manager_->RegisterClient(access_token);
   oauth2_access_token_fetcher_.reset();
 }
 
 }  // namespace policy