Split UserCloudPolicyManager implementation.

chrome/browser/policy/user_policy_signin_service.cc

Index: chrome/browser/policy/user_policy_signin_service.cc
diff --git a/chrome/browser/policy/user_policy_signin_service.cc b/chrome/browser/policy/user_policy_signin_service.cc
index 7a6787254d52caa5ee30d905b878176a2f8dba40..390d79c06422cd5d82ce8f40d259145d558d488d 100644
--- a/chrome/browser/policy/user_policy_signin_service.cc
+++ b/chrome/browser/policy/user_policy_signin_service.cc
@@ -129,9 +129,7 @@ void UserPolicySigninService::ConfigureUserCloudPolicyManager() {
       // 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);
     }
@@ -191,7 +189,6 @@ void UserPolicySigninService::OnGetTokenFailure(
   DLOG(WARNING) << "Could not fetch access token for "
                 << kServiceScopeChromeOSDeviceManagement;
   oauth2_access_token_fetcher_.reset();
-  manager_->CancelWaitForPolicyFetch();
 }
 
 void UserPolicySigninService::OnGetTokenSuccess(