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 d19d26eac711f69482206398142288c95d468b63..8a00ed540d51434e1ccc9afdb68c911a372ca5ad 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 |
@@ -34,6 +34,7 @@ |
#include "chromeos/system/fake_statistics_provider.h" |
#include "chromeos/system/statistics_provider.h" |
#include "components/policy/core/common/cloud/cloud_policy_client.h" |
+#include "components/policy/core/common/cloud/cloud_policy_constants.h" |
#include "components/policy/core/common/cloud/mock_device_management_service.h" |
#include "components/policy/core/common/external_data_fetcher.h" |
#include "components/policy/core/common/schema_registry.h" |
@@ -293,7 +294,7 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest |
protected: |
DeviceCloudPolicyManagerChromeOSEnrollmentTest() |
: is_auto_enrollment_(false), |
- management_mode_(em::PolicyData::ENTERPRISE_MANAGED), |
+ management_mode_(MANAGEMENT_MODE_ENTERPRISE), |
register_status_(DM_STATUS_SUCCESS), |
policy_fetch_status_(DM_STATUS_SUCCESS), |
robot_auth_fetch_status_(DM_STATUS_SUCCESS), |
@@ -342,7 +343,7 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest |
ASSERT_TRUE(manager_->core()->client()); |
EXPECT_TRUE(manager_->core()->client()->is_registered()); |
- if (management_mode_ != em::PolicyData::CONSUMER_MANAGED) { |
+ if (management_mode_ != MANAGEMENT_MODE_CONSUMER) { |
EXPECT_EQ(DEVICE_MODE_ENTERPRISE, install_attributes_->GetMode()); |
EXPECT_TRUE(store_->has_policy()); |
EXPECT_TRUE(store_->is_managed()); |
@@ -438,7 +439,7 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest |
url_fetcher->delegate()->OnURLFetchComplete(url_fetcher); |
} |
- if (management_mode_ == em::PolicyData::CONSUMER_MANAGED) |
+ if (management_mode_ == MANAGEMENT_MODE_CONSUMER) |
FlushDeviceSettings(); |
else |
base::RunLoop().RunUntilIdle(); |
@@ -469,7 +470,7 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest |
} |
bool is_auto_enrollment_; |
- em::PolicyData::ManagementMode management_mode_; |
+ ManagementMode management_mode_; |
DeviceManagementStatus register_status_; |
em::DeviceManagementResponse register_response_; |
@@ -591,7 +592,7 @@ TEST_F(DeviceCloudPolicyManagerChromeOSEnrollmentTest, LoadError) { |
TEST_F(DeviceCloudPolicyManagerChromeOSEnrollmentTest, |
SuccessfulConsumerManagementEnrollment) { |
- management_mode_ = em::PolicyData::CONSUMER_MANAGED; |
+ management_mode_ = MANAGEMENT_MODE_CONSUMER; |
owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey()); |
InitOwner(device_policy_.policy_data().username(), true); |
FlushDeviceSettings(); |