chrome/browser/chromeos/settings/device_settings_provider.cc - Issue 1019283004: Switch to direct use of OwnerSettingsServiceChromeOS::Set() in tests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/settings/device_settings_provider.cc

Issue 1019283004: Switch to direct use of OwnerSettingsServiceChromeOS::Set() in tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Static enterprise-owner marker. Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/login/kiosk_browsertest.cc ('K') | « chrome/browser/chromeos/policy/status_uploader_unittest.cc ('k') | chrome/browser/chromeos/settings/device_settings_test_helper.h » ('j') | chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 02bb836d980022db8a2b9daf7871ef30528fcb7d..b02ba2bb4cb2e4324fbe432fa2b8a8af6b95162e 100644

--- a/chrome/browser/chromeos/settings/device_settings_provider.cc

+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc

@@ -55,10 +55,14 @@ const char* const kKnownSettings[] = {

kAllowedConnectionTypesForUpdate,

kAttestationForContentProtectionEnabled,

kDeviceAttestationEnabled,

+ kDeviceDisabled,

+ kDeviceDisabledMessage,

kDeviceOwner,

+ kExtensionCacheSize,

kHeartbeatEnabled,

kHeartbeatFrequency,

kPolicyMissingMitigationMode,

+ kRebootOnShutdown,

kReleaseChannel,

kReleaseChannelDelegated,

kReportDeviceActivityTimes,

@@ -78,10 +82,6 @@ const char* const kKnownSettings[] = {

kSystemUse24HourClock,

kUpdateDisabled,

kVariationsRestrictParameter,

- kDeviceDisabled,

- kDeviceDisabledMessage,

- kRebootOnShutdown,

- kExtensionCacheSize,

};

bool HasOldMetricsFile() {