Cleanup of system settings constants (ab)use.

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc

Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
index ebc0442e695ddad15228adc68350ac9f77567693..ade9de8967c7f7879a023148e1d05d29fa757beb 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc
@@ -138,10 +138,12 @@ std::string DeviceCloudPolicyManagerChromeOS::GetDeviceRequisition() const {
   std::string requisition;
   const PrefService::Preference* pref = local_state_->FindPreference(
       prefs::kDeviceEnrollmentRequisition);
-  if (pref->IsDefaultValue())
-    requisition = GetMachineStatistic(chromeos::kOemDeviceRequisitionKey);
-  else
+  if (pref->IsDefaultValue()) {
+    requisition =
+        GetMachineStatistic(chromeos::system::kOemDeviceRequisitionKey);
+  } else {
     pref->GetValue()->GetAsString(&requisition);
+  }
 
   return requisition;
 }
@@ -165,14 +167,15 @@ bool DeviceCloudPolicyManagerChromeOS::ShouldAutoStartEnrollment() const {
   if (local_state_->HasPrefPath(prefs::kDeviceEnrollmentAutoStart))
     return local_state_->GetBoolean(prefs::kDeviceEnrollmentAutoStart);
 
-  return GetMachineFlag(chromeos::kOemIsEnterpriseManagedKey, false);
+  return GetMachineFlag(chromeos::system::kOemIsEnterpriseManagedKey, false);
 }
 
 bool DeviceCloudPolicyManagerChromeOS::CanExitEnrollment() const {
   if (local_state_->HasPrefPath(prefs::kDeviceEnrollmentCanExit))
     return local_state_->GetBoolean(prefs::kDeviceEnrollmentCanExit);
 
-  return GetMachineFlag(chromeos::kOemCanExitEnterpriseEnrollmentKey, true);
+  return GetMachineFlag(chromeos::system::kOemCanExitEnterpriseEnrollmentKey,
+                        true);
 }
 
 void DeviceCloudPolicyManagerChromeOS::Shutdown() {