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..f022f0b25e623f7c797dc7269870e12d6b4bfeb6 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,30 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest |
if (done_) |
return; |
+ // Process the second policy refresh that happens after the enrollment |
+ // completes. |
+ MockDeviceManagementJob* component_policy_fetch_job = NULL; |
+ EXPECT_CALL(device_management_service_, |
+ CreateJob(DeviceManagementRequestJob::TYPE_POLICY_FETCH, _)) |
+ .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(); } |