Added support for signed policy blobs on desktop.

chrome/browser/policy/cloud/user_policy_signin_service_base.cc

 // Copyright 2013 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_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 33 matching lines @@
 }
 
 UserPolicySigninServiceBase::~UserPolicySigninServiceBase() {}
 
 void UserPolicySigninServiceBase::FetchPolicyForSignedInUser(
     const std::string& username,
     const std::string& dm_token,
     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());
 
   // Now initiate a policy fetch.
   manager->core()->service()->RefreshPolicy(callback);
 }
 
 void UserPolicySigninServiceBase::Observe(
     int type,
     const content::NotificationSource& source,
@@ skipping 81 matching lines @@
   // If the user should not get policy, just bail out.
   if (!policy_manager() || !ShouldLoadPolicyForUser(username)) {
     DVLOG(1) << "Signed in user is not in the whitelist";
     return scoped_ptr<CloudPolicyClient>();
   }
 
   // If the DeviceManagementService is not yet initialized, start it up now.
   device_management_service_->ScheduleInitialization(0);
 
   // Create a new CloudPolicyClient for fetching the DMToken.
-  return UserCloudPolicyManager::CreateCloudPolicyClient(
+  return policy_manager()->CreateCloudPolicyClient(
       device_management_service_, CreateSystemRequestContext());
 }
 
 bool UserPolicySigninServiceBase::ShouldLoadPolicyForUser(
     const std::string& username) {
   if (username.empty())
     return false;  // Not signed in.
 
   if (ShouldForceLoadPolicy())
     return true;
@@ skipping 33 matching lines @@
   }
 
   UserCloudPolicyManager* manager = policy_manager();
   // Initialize the UCPM if it is not already initialized.
   if (!manager->core()->service()) {
     // If there is no cached DMToken then we can detect this when the
     // OnInitializationCompleted() callback is invoked and this will
     // initiate a policy fetch.
     InitializeUserCloudPolicyManager(
         username,
-        UserCloudPolicyManager::CreateCloudPolicyClient(
+        manager->CreateCloudPolicyClient(
             device_management_service_,
             CreateUserRequestContext(profile_request_context)).Pass());
   } else {
     manager->SetSigninUsername(username);
   }
 
   // If the CloudPolicyService is initialized, kick off registration.
   // Otherwise OnInitializationCompleted is invoked as soon as the service
   // finishes its initialization.
   if (manager->core()->service()->IsInitializationComplete())
@@ skipping 35 matching lines @@
 scoped_refptr<net::URLRequestContextGetter>
 UserPolicySigninServiceBase::CreateUserRequestContext(
     scoped_refptr<net::URLRequestContextGetter> profile_request_context) {
   return new UserPolicyRequestContext(
       profile_request_context,
       system_request_context(),
       content::GetUserAgent(GURL(device_management_service_->GetServerUrl())));
 }
 
 }  // namespace policy