Added support for signed policy blobs on desktop.

components/policy/core/common/cloud/cloud_policy_client_unittest.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 "components/policy/core/common/cloud/cloud_policy_client.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 65 matching lines @@
         registration_request_.mutable_register_request();
     register_request->set_type(em::DeviceRegisterRequest::USER);
     register_request->set_machine_id(kMachineID);
     register_request->set_machine_model(kMachineModel);
     registration_response_.mutable_register_response()->
         set_device_management_token(kDMToken);
 
     em::PolicyFetchRequest* policy_fetch_request =
         policy_request_.mutable_policy_request()->add_request();
     policy_fetch_request->set_policy_type(dm_protocol::kChromeUserPolicyType);
-#if defined(OS_CHROMEOS)
     policy_fetch_request->set_signature_type(em::PolicyFetchRequest::SHA1_RSA);
-#else
-    policy_fetch_request->set_signature_type(em::PolicyFetchRequest::NONE);
-#endif
+    policy_fetch_request->set_verification_key_hash(kPolicyVerificationKeyHash);
     policy_response_.mutable_policy_response()->add_response()->set_policy_data(
         CreatePolicyData("fake-policy-data"));
 
     unregistration_request_.mutable_unregister_request();
     unregistration_response_.mutable_unregister_response();
     upload_certificate_request_.mutable_cert_upload_request()->
         set_device_certificate(kDeviceCertificate);
     upload_certificate_response_.mutable_cert_upload_response();
   }
 
@@ skipping 14 matching lines @@
     client_->SetupRegistration(kDMToken, client_id_);
   }
 
   void CreateClient(UserAffiliation user_affiliation) {
     if (client_.get())
       client_->RemoveObserver(&observer_);
 
     request_context_ = new net::TestURLRequestContextGetter(
         loop_.message_loop_proxy());
     client_.reset(new CloudPolicyClient(kMachineID, kMachineModel,
+                                        kPolicyVerificationKeyHash,
                                         user_affiliation, &status_provider_,
                                         &service_,
                                         request_context_));
     client_->AddNamespaceToFetch(policy_ns_key_);
     client_->AddObserver(&observer_);
   }
 
   void ExpectRegistration(const std::string& oauth_token) {
     EXPECT_CALL(service_,
                 CreateJob(DeviceManagementRequestJob::TYPE_REGISTRATION,
@@ skipping 445 matching lines @@
   EXPECT_CALL(service_, StartJob(_, _, _, _, _, _, _));
   EXPECT_CALL(observer_, OnClientError(_));
   CloudPolicyClient::StatusCallback callback = base::Bind(
       &MockUploadCertificateObserver::OnUploadComplete,
       base::Unretained(&upload_certificate_observer_));
   client_->UploadCertificate(kDeviceCertificate, callback);
   EXPECT_EQ(DM_STATUS_REQUEST_FAILED, client_->status());
 }
 
 }  // namespace policy