diff options
| author | ginkage <ginkage@chromium.org> | 2015-04-22 10:54:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-22 17:55:14 +0000 |
| commit | 3a599661a49fa5ebfe63cb4016bb8efcd2d02712 (patch) | |
| tree | e3189872e381c763f90909c4a18c4bc18cebad90 /chrome/browser/chromeos/settings/device_settings_provider.cc | |
| parent | f72001505b06d68f7716b474e35865f33fffd4fe (diff) | |
| download | chromium_src-3a599661a49fa5ebfe63cb4016bb8efcd2d02712.zip chromium_src-3a599661a49fa5ebfe63cb4016bb8efcd2d02712.tar.gz chromium_src-3a599661a49fa5ebfe63cb4016bb8efcd2d02712.tar.bz2 | |
Get rid of excessive CrosSettings::Get()->Set*() usage, mostly in tests.
The following tests were affected:
unit_tests:
AttestationPolicyObserverTest.*
CryptohomeAuthenticatorTest.*
ExtensionCacheTest.*
EPKPChallengeMachineKeyTest.DevicePolicyDisabled
EPKPChallengeUserKeyTest.DevicePolicyDisabled
HeartbeatSchedulerTest.*
NetworkConfigurationUpdaterTest.*
PlatformVerificationFlowTest.*
StatusUploaderTest.*
ShutdownPolicyHandlerTest.*
UserManagerTest.*
browser_tests:
DeviceStatusCollectorTest.*
KioskAppManagerTest.*
KioskEnterpriseTest.*
KioskTest.*
KioskUpdateTest.*
BUG=433840
Review URL: https://codereview.chromium.org/1019283004
Cr-Commit-Position: refs/heads/master@{#326338}
Diffstat (limited to 'chrome/browser/chromeos/settings/device_settings_provider.cc')
| -rw-r--r-- | chrome/browser/chromeos/settings/device_settings_provider.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc index a33b23f..05fe7685 100644 --- a/chrome/browser/chromeos/settings/device_settings_provider.cc +++ b/chrome/browser/chromeos/settings/device_settings_provider.cc @@ -56,10 +56,14 @@ const char* const kKnownSettings[] = { kAllowedConnectionTypesForUpdate, kAttestationForContentProtectionEnabled, kDeviceAttestationEnabled, + kDeviceDisabled, + kDeviceDisabledMessage, kDeviceOwner, + kExtensionCacheSize, kHeartbeatEnabled, kHeartbeatFrequency, kPolicyMissingMitigationMode, + kRebootOnShutdown, kReleaseChannel, kReleaseChannelDelegated, kReportDeviceActivityTimes, @@ -79,10 +83,6 @@ const char* const kKnownSettings[] = { kSystemUse24HourClock, kUpdateDisabled, kVariationsRestrictParameter, - kDeviceDisabled, - kDeviceDisabledMessage, - kRebootOnShutdown, - kExtensionCacheSize, }; bool HasOldMetricsFile() { |