Index: chrome/browser/chromeos/settings/device_settings_provider.cc |
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc |
index 8f662117e586701cbb76656bfd5eff0a1ed84326..8a1e26055e984a9b83b2e26e1d74f68543893032 100644 |
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc |
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc |
@@ -36,6 +36,9 @@ namespace chromeos { |
namespace { |
+// Legacy policy file location. Used to detect migration from pre v12 ChromeOS. |
+const char kLegacyPolicyFile[] = "/var/lib/whitelist/preferences"; |
+ |
// List of settings handled by the DeviceSettingsProvider. |
const char* kKnownSettings[] = { |
kAccountsPrefAllowGuest, |
@@ -64,12 +67,18 @@ const char* kKnownSettings[] = { |
kSystemTimezonePolicy, |
}; |
-// Legacy policy file location. Used to detect migration from pre v12 ChromeOS. |
-const char kLegacyPolicyFile[] = "/var/lib/whitelist/preferences"; |
+} // namespace |
+ |
+const char** DeviceSettingsProvider::kKnownSettingsBegin = kKnownSettings; |
+const char** DeviceSettingsProvider::kKnownSettingsEnd = |
+ kKnownSettings + arraysize(kKnownSettings); |
+ |
+namespace { |
bool IsControlledSetting(const std::string& pref_path) { |
- const char** end = kKnownSettings + arraysize(kKnownSettings); |
- return std::find(kKnownSettings, end, pref_path) != end; |
+ static const char** begin = DeviceSettingsProvider::kKnownSettingsBegin; |
+ static const char** end = DeviceSettingsProvider::kKnownSettingsEnd; |
+ return std::find(begin, end, pref_path) != end; |
} |
bool HasOldMetricsFile() { |