Added support for signed policy blobs on desktop.

chrome/browser/policy/cloud/user_policy_signin_service_base.cc

Index: chrome/browser/policy/cloud/user_policy_signin_service_base.cc
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_base.cc b/chrome/browser/policy/cloud/user_policy_signin_service_base.cc
index 40c0e0bea086f51a1ca41fca62d25c94d16b5956..8ea3f661b1df4ccafe6786a469dd5e8229c167cb 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service_base.cc
+++ b/chrome/browser/policy/cloud/user_policy_signin_service_base.cc
@@ -51,19 +51,19 @@ void UserPolicySigninServiceBase::FetchPolicyForSignedInUser(
     const std::string& client_id,
     scoped_refptr<net::URLRequestContextGetter> profile_request_context,
     const PolicyFetchCallback& callback) {
+  UserCloudPolicyManager* manager = policy_manager();
+  DCHECK(manager);

[Mattias Nissler (ping if slow), 2014/01/27 13:52:13]

remove, we'll crash anyways.

[Andrew T Wilson (Slow), 2014/01/30 17:10:31]

Reverted this change entirely.

   scoped_ptr<CloudPolicyClient> client(
-      UserCloudPolicyManager::CreateCloudPolicyClient(
+      manager->CreateCloudPolicyClient(
           device_management_service_,
           CreateUserRequestContext(profile_request_context)).Pass());
   client->SetupRegistration(dm_token, client_id);
+  DCHECK(!manager->core()->client());
   DCHECK(client->is_registered());
   // The user has just signed in, so the UserCloudPolicyManager should not yet
   // be initialized. This routine will initialize the UserCloudPolicyManager
   // with the passed client and will proactively ask the client to fetch
   // policy without waiting for the CloudPolicyService to finish initialization.
-  UserCloudPolicyManager* manager = policy_manager();
-  DCHECK(manager);
-  DCHECK(!manager->core()->client());
   InitializeUserCloudPolicyManager(username, client.Pass());
   DCHECK(manager->IsClientRegistered());
 
@@ -165,7 +165,7 @@ UserPolicySigninServiceBase::CreateClientForRegistrationOnly(
   device_management_service_->ScheduleInitialization(0);
 
   // Create a new CloudPolicyClient for fetching the DMToken.
-  return UserCloudPolicyManager::CreateCloudPolicyClient(
+  return policy_manager()->CreateCloudPolicyClient(
       device_management_service_, CreateSystemRequestContext());
 }
 
@@ -219,7 +219,7 @@ void UserPolicySigninServiceBase::InitializeForSignedInUser(
     // initiate a policy fetch.
     InitializeUserCloudPolicyManager(
         username,
-        UserCloudPolicyManager::CreateCloudPolicyClient(
+        manager->CreateCloudPolicyClient(
             device_management_service_,
             CreateUserRequestContext(profile_request_context)).Pass());
   } else {