Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4869)

Unified Diff: chrome/test/data/policy/policy_test_cases.json

Issue 11276006: Add Chrome OS-specific controlled setting indicators (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Mark DeviceMetricsReporting policy as official only. Created 8 years, 2 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
« no previous file with comments | « chrome/browser/resources/options/sync_section.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/policy/policy_test_cases.json
diff --git a/chrome/test/data/policy/policy_test_cases.json b/chrome/test/data/policy/policy_test_cases.json
index 67731762cabdf91aed53d24b91dc46d6c8130f7a..5deaee536bf5330ddd00e37347a1552a64acb9ca 100644
--- a/chrome/test/data/policy/policy_test_cases.json
+++ b/chrome/test/data/policy/policy_test_cases.json
@@ -1535,21 +1535,31 @@
]
},
- "----- Chrome OS policies ------------------------------------------------": {
- "note": "TODO(frankf): Add prefs for these after crosbug.com/28756 is fixed.",
- "note 2": "TODO(joaodasilva): that bug is now obsolete and these tests can be expanded to chromeos."
- },
+ "----- Chrome OS policies ------------------------------------------------": {},
"ChromeOsLockOnIdleSuspend": {
"os": ["chromeos"],
+ "can_be_recommended": true,
"test_policy": { "ChromeOsLockOnIdleSuspend": true },
- "settings_pages": ["chrome://settings-frame"]
+ "settings_pages": ["chrome://settings-frame"],
+ "pref_mappings": [
+ { "pref": "settings.enable_screen_lock",
+ "indicator_tests": [
+ { "policy": { "ChromeOsLockOnIdleSuspend": true } }
+ ]
+ }
+ ]
},
"PolicyRefreshRate": {
"os": ["chromeos"],
"test_policy": { "PolicyRefreshRate": 300000 },
- "settings_pages": []
+ "settings_pages": [],
+ "pref_mappings": [
+ { "pref": "policy.user_refresh_rate",
+ "local_state": true
+ }
+ ]
},
"OpenNetworkConfiguration": {
@@ -1560,38 +1570,59 @@
"DriveDisabled": {
"os": ["chromeos"],
- "test_policy": { "DriveDisabled": true },
- "settings_pages": []
+ "test_policy": { "DriveDisabled": false },
+ "settings_pages": [],
+ "pref_mappings": [
+ { "pref": "gdata.disabled" }
+ ]
},
"DriveDisabledOverCellular": {
"os": ["chromeos"],
"test_policy": { "DriveDisabledOverCellular": true },
- "settings_pages": []
+ "settings_pages": [],
+ "pref_mappings": [
+ { "pref": "gdata.cellular.disabled" }
+ ]
},
"PinnedLauncherApps": {
"os": ["chromeos"],
+ "can_be_recommended": true,
"test_policy": { "PinnedLauncherApps": [] },
- "settings_pages": []
+ "settings_pages": [],
+ "pref_mappings": [
+ { "pref": "pinned_launcher_apps" }
+ ]
},
"ExternalStorageDisabled": {
"os": ["chromeos"],
"test_policy": { "ExternalStorageDisabled": true },
- "settings_pages": []
+ "settings_pages": [],
+ "pref_mappings": [
+ { "pref": "hardware.external_storage_disabled" }
+ ]
},
"AudioOutputAllowed": {
"os": ["chromeos"],
"test_policy": { "AudioOutputAllowed": true },
- "settings_pages": []
+ "settings_pages": [],
+ "pref_mappings": [
+ { "pref": "hardware.audio_output_enabled",
+ "local_state": true }
+ ]
},
"AudioCaptureAllowed": {
"os": ["chromeos"],
"test_policy": { "AudioCaptureAllowed": true },
- "settings_pages": []
+ "settings_pages": [],
+ "pref_mappings": [
+ { "pref": "hardware.audio_capture_enabled",
+ "local_state": true }
+ ]
},
"----- Chrome OS device policies ---------------------------------------": {},
@@ -1599,7 +1630,11 @@
"DevicePolicyRefreshRate": {
"os": ["chromeos"],
"test_policy": { "DevicePolicyRefreshRate": 300000 },
- "settings_pages": []
+ "settings_pages": [],
+ "pref_mappings": [
+ { "pref": "policy.device_refresh_rate",
+ "local_state": true }
+ ]
},
"ChromeOsReleaseChannel": {
@@ -1670,8 +1705,19 @@
"DeviceMetricsReportingEnabled": {
"os": ["chromeos"],
+ "official_only": true,
"test_policy": { "DeviceMetricsReportingEnabled": true },
- "settings_pages": []
+ "settings_pages": [],
+ "pref_mappings": [
+ { "pref": "cros.metrics.reportingEnabled",
+ "indicator_test_setup_js": "Preferences.getInstance().addEventListener('alternate_error_pages.enabled', function(event) { Preferences.prefsChangedCallback(['cros.metrics.reportingEnabled', {value: event.value.value, controlledBy: event.value.controlledBy, disabled: event.value.disabled}]); });",
+ "indicator_tests": [
+ { "policy": { "AlternateErrorPagesEnabled": true } }
+ ]
+ }
+ ],
+
+ "note": "TODO(bartfab): The |indicator_test_setup_js| above is a hack that makes |cros.metrics.reportingEnabled| track the status of the entirely unrelated |alternate_error_pages.enabled| pref. This is because cros settings cannot currently be made policy-controlled in browser tests. Remove this hack once that restriction is lifted."
},
"DeviceEphemeralUsersEnabled": {
« no previous file with comments | « chrome/browser/resources/options/sync_section.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698