Chromium Code Reviews| Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc |
| diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc |
| index 441197a9ee4ea5acadad43add61fb7ca834add81..637212312d37a5fd502684cfbaddf94e2c42cc91 100644 |
| --- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc |
| +++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc |
| @@ -100,7 +100,10 @@ class TestingDeviceCloudPolicyManagerChromeOS |
| ServerBackedStateKeysBroker* state_keys_broker) |
| : DeviceCloudPolicyManagerChromeOS(std::move(store), |
| task_runner, |
| - state_keys_broker) {} |
| + state_keys_broker) { |
| + set_is_component_policy_enabled_for_testing(false); |
| + } |
| + |
| ~TestingDeviceCloudPolicyManagerChromeOS() override {} |
| }; |
| @@ -600,11 +603,29 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest |
| if (done_) |
| return; |
| + // Process the second policy refresh, now with component policy types added. |
| + MockDeviceManagementJob* component_policy_fetch_job = NULL; |
| + EXPECT_CALL(device_management_service_, |
| + CreateJob(DeviceManagementRequestJob::TYPE_POLICY_FETCH, _)) |
|
Andrew T Wilson (Slow)
2016/10/28 14:49:56
I'm somewhat confused - doesn't TestingDeviceCloud
emaxx
2016/10/31 15:51:20
Right, the comment was misleading. The second poli
|
| + .Times(AtMost(1)) |
| + .WillOnce(device_management_service_.CreateAsyncJob( |
| + &component_policy_fetch_job)); |
| + EXPECT_CALL(device_management_service_, |
| + StartJob(dm_protocol::kValueRequestPolicy, _, _, _, _, _)) |
| + .Times(AtMost(1)); |
| + |
| // Key installation and policy load. |
| device_settings_test_helper_.set_policy_blob(loaded_blob_); |
| owner_key_util_->SetPublicKeyFromPrivateKey( |
| *device_policy_.GetNewSigningKey()); |
| ReloadDeviceSettings(); |
| + |
| + // Respond to the second policy refresh. |
| + if (component_policy_fetch_job) { |
| + component_policy_fetch_job->SendResponse(policy_fetch_status_, |
| + policy_fetch_response_); |
| + } |
| + Mock::VerifyAndClearExpectations(&device_management_service_); |
| } |
| bool ShouldRegisterWithCert() const override { return GetParam(); } |