summaryrefslogtreecommitdiffstats
path: root/chrome/test/functional/policy_test_cases.py
diff options
context:
space:
mode:
authorpastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 14:16:54 +0000
committerpastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 14:16:54 +0000
commitb647ed2eaab8f34ba9ae19c6472fa5021b0913d4 (patch)
treee1bf403f3d8aeb1b344581c02e29c7bdc0d4c588 /chrome/test/functional/policy_test_cases.py
parentd6a5d747415a472f8755af23de94cd42fb20799a (diff)
downloadchromium_src-b647ed2eaab8f34ba9ae19c6472fa5021b0913d4.zip
chromium_src-b647ed2eaab8f34ba9ae19c6472fa5021b0913d4.tar.gz
chromium_src-b647ed2eaab8f34ba9ae19c6472fa5021b0913d4.tar.bz2
Add most new policies to the about:policy list.
Also structured the decoding code a bit. BUG=chromium-os:27582 TEST=none Review URL: https://chromiumcodereview.appspot.com/9666003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/functional/policy_test_cases.py')
-rwxr-xr-xchrome/test/functional/policy_test_cases.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/test/functional/policy_test_cases.py b/chrome/test/functional/policy_test_cases.py
index ba9a06a..bc5eb3a 100755
--- a/chrome/test/functional/policy_test_cases.py
+++ b/chrome/test/functional/policy_test_cases.py
@@ -187,6 +187,10 @@ class PolicyPrefsTestCases(object):
'DeviceDataRoamingEnabled': (True, [], []),
'DeviceMetricsReportingEnabled': (True, [], []),
'DeviceEphemeralUsersEnabled': (True, [], []),
+ 'DeviceIdleLogoutTimeout': (60000, [], []),
+ 'DeviceIdleLogoutWarningDuration': (15000, [], []),
+ 'DeviceLoginScreenSaverId': ('lcncmkcnkcdbbanbjakcencbaoegdjlp', [], []),
+ 'DeviceLoginScreenSaverTimeout': (30000, [], []),
# Chrome Frame policies:
'ChromeFrameRendererSettings': (0, [], []),