| Index: chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
|
| index 574177b306114d7fc978a5ac82b71cf0261ba9ea..15642edf193bd21cebc3a4d3734c488d22ed9db5 100644
|
| --- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
|
| +++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc
|
| @@ -70,7 +70,7 @@ em::DeviceRegisterRequest::Flavor EnrollmentModeToRegistrationFlavor(
|
|
|
| EnrollmentHandlerChromeOS::EnrollmentHandlerChromeOS(
|
| DeviceCloudPolicyStoreChromeOS* store,
|
| - EnterpriseInstallAttributes* install_attributes,
|
| + chromeos::InstallAttributes* install_attributes,
|
| ServerBackedStateKeysBroker* state_keys_broker,
|
| chromeos::attestation::AttestationFlow* attestation_flow,
|
| std::unique_ptr<CloudPolicyClient> client,
|
| @@ -408,13 +408,13 @@ void EnrollmentHandlerChromeOS::HandleSetManagementSettingsDone(bool success) {
|
| }
|
|
|
| void EnrollmentHandlerChromeOS::HandleLockDeviceResult(
|
| - EnterpriseInstallAttributes::LockResult lock_result) {
|
| + chromeos::InstallAttributes::LockResult lock_result) {
|
| CHECK_EQ(STEP_LOCK_DEVICE, enrollment_step_);
|
| switch (lock_result) {
|
| - case EnterpriseInstallAttributes::LOCK_SUCCESS:
|
| + case chromeos::InstallAttributes::LOCK_SUCCESS:
|
| StartStoreRobotAuth();
|
| break;
|
| - case EnterpriseInstallAttributes::LOCK_NOT_READY:
|
| + case chromeos::InstallAttributes::LOCK_NOT_READY:
|
| // We wait up to |kLockRetryTimeoutMs| milliseconds and if it hasn't
|
| // succeeded by then show an error to the user and stop the enrollment.
|
| if (lockbox_init_duration_ < kLockRetryTimeoutMs) {
|
| @@ -427,17 +427,17 @@ void EnrollmentHandlerChromeOS::HandleLockDeviceResult(
|
| base::TimeDelta::FromMilliseconds(kLockRetryIntervalMs));
|
| lockbox_init_duration_ += kLockRetryIntervalMs;
|
| } else {
|
| - HandleLockDeviceResult(EnterpriseInstallAttributes::LOCK_TIMEOUT);
|
| + HandleLockDeviceResult(chromeos::InstallAttributes::LOCK_TIMEOUT);
|
| }
|
| break;
|
| - case EnterpriseInstallAttributes::LOCK_TIMEOUT:
|
| - case EnterpriseInstallAttributes::LOCK_BACKEND_INVALID:
|
| - case EnterpriseInstallAttributes::LOCK_ALREADY_LOCKED:
|
| - case EnterpriseInstallAttributes::LOCK_SET_ERROR:
|
| - case EnterpriseInstallAttributes::LOCK_FINALIZE_ERROR:
|
| - case EnterpriseInstallAttributes::LOCK_READBACK_ERROR:
|
| - case EnterpriseInstallAttributes::LOCK_WRONG_DOMAIN:
|
| - case EnterpriseInstallAttributes::LOCK_WRONG_MODE:
|
| + case chromeos::InstallAttributes::LOCK_TIMEOUT:
|
| + case chromeos::InstallAttributes::LOCK_BACKEND_INVALID:
|
| + case chromeos::InstallAttributes::LOCK_ALREADY_LOCKED:
|
| + case chromeos::InstallAttributes::LOCK_SET_ERROR:
|
| + case chromeos::InstallAttributes::LOCK_FINALIZE_ERROR:
|
| + case chromeos::InstallAttributes::LOCK_READBACK_ERROR:
|
| + case chromeos::InstallAttributes::LOCK_WRONG_DOMAIN:
|
| + case chromeos::InstallAttributes::LOCK_WRONG_MODE:
|
| ReportResult(EnrollmentStatus::ForLockError(lock_result));
|
| break;
|
| }
|
|
|