Cleanup of system settings constants (ab)use.

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
@@ skipping 120 matching lines @@
   if (enrollment_handler_.get()) {
     enrollment_handler_.reset();
     StartIfManaged();
   }
 }
 
 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;
 }
 
 void DeviceCloudPolicyManagerChromeOS::SetDeviceRequisition(
     const std::string& requisition) {
   if (local_state_) {
     if (requisition.empty()) {
       local_state_->ClearPref(prefs::kDeviceEnrollmentRequisition);
       local_state_->ClearPref(prefs::kDeviceEnrollmentAutoStart);
       local_state_->ClearPref(prefs::kDeviceEnrollmentCanExit);
     } else {
       local_state_->SetString(prefs::kDeviceEnrollmentRequisition, requisition);
       local_state_->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true);
       local_state_->SetBoolean(prefs::kDeviceEnrollmentCanExit, false);
     }
   }
 }
 
 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() {
   CloudPolicyManager::Shutdown();
   device_status_provider_.reset();
 }
 
 void DeviceCloudPolicyManagerChromeOS::OnStoreLoaded(CloudPolicyStore* store) {
   CloudPolicyManager::OnStoreLoaded(store);
 
@@ skipping 70 matching lines @@
     core()->Connect(CreateClient());
     core()->StartRefreshScheduler();
     core()->TrackRefreshDelayPref(local_state_,
                                   prefs::kDevicePolicyRefreshRate);
     attestation_policy_observer_.reset(
         new chromeos::attestation::AttestationPolicyObserver(client()));
   }
 }
 
 }  // namespace policy