diff options
author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 15:13:21 +0000 |
---|---|---|
committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 15:13:21 +0000 |
commit | b2401b8e549e5d788fcee92a3b8c7d018f55aff1 (patch) | |
tree | cab309a21cacfa4534b770040789266e56c174d3 | |
parent | d44913f15e2b75285f9fda8784e638d015ff5baa (diff) | |
download | chromium_src-b2401b8e549e5d788fcee92a3b8c7d018f55aff1.zip chromium_src-b2401b8e549e5d788fcee92a3b8c7d018f55aff1.tar.gz chromium_src-b2401b8e549e5d788fcee92a3b8c7d018f55aff1.tar.bz2 |
Fix supported_on list for some policies.
BUG=106077, 43281
TEST=EnableOriginBoundCerts and EnableMemoryInfo policies are available on ChromeOS
Review URL: http://codereview.chromium.org/9160030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119071 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/app/policy/policy_templates.json | 10 | ||||
-rwxr-xr-x | chrome/test/functional/policy_prefs_ui.py | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json index b7257ce..4902f99 100644 --- a/chrome/app/policy/policy_templates.json +++ b/chrome/app/policy/policy_templates.json @@ -2103,7 +2103,7 @@ { 'name': 'MaxConnectionsPerProxy', 'type': 'int', - 'supported_on': ['chrome.*:14-','chrome_os:0.14-'], + 'supported_on': ['chrome.*:14-', 'chrome_os:0.14-'], 'features': {'dynamic_refresh': False}, 'example_value': 32, 'id': 92, @@ -2211,7 +2211,7 @@ { 'name': 'EnterpriseWebStoreURL', 'type': 'string', - 'supported_on': ['chrome.*:17-','chrome_os:0.17-'], + 'supported_on': ['chrome.*:17-', 'chrome_os:0.17-'], 'features': {'dynamic_refresh': True}, 'example_value': 'http://company-intranet/chromeapps', 'id': 112, @@ -2223,7 +2223,7 @@ { 'name': 'EnterpriseWebStoreName', 'type': 'string', - 'supported_on': ['chrome.*:17-','chrome_os:0.17-'], + 'supported_on': ['chrome.*:17-', 'chrome_os:0.17-'], 'features': {'dynamic_refresh': True}, 'example_value': 'WidgCo Chrome Apps', 'id': 113, @@ -2248,7 +2248,7 @@ { 'name': 'EnableMemoryInfo', 'type': 'main', - 'supported_on': ['chrome.*:16-'], + 'supported_on': ['chrome.*:17-', 'chrome_os:0.18-'], 'features': {'dynamic_refresh': True}, 'future': True, 'example_value': False, @@ -2273,7 +2273,7 @@ { 'name': 'DisableSSLRecordSplitting', 'type': 'main', - 'supported_on': ['chrome.*:18-','chrome_os:0.18-'], + 'supported_on': ['chrome.*:18-', 'chrome_os:0.18-'], 'features': {'dynamic_refresh': True}, 'example_value': True, 'id': 118, diff --git a/chrome/test/functional/policy_prefs_ui.py b/chrome/test/functional/policy_prefs_ui.py index 9ede39b..6699268 100755 --- a/chrome/test/functional/policy_prefs_ui.py +++ b/chrome/test/functional/policy_prefs_ui.py @@ -90,7 +90,7 @@ class PolicyPrefsUITest(policy_base.PolicyTestBase): 'PrintingEnabled': (False, []), # Note: supported_on is empty for this policy. 'CloudPrintProxyEnabled': (True, [], []), - 'CloudPrintSubmitEnabled': (False, [], ['win', 'mac', 'linux']), + 'CloudPrintSubmitEnabled': (False, [], [ 'win', 'mac', 'linux' ]), 'SafeBrowsingEnabled': (False, [ ADVANCED ]), # TODO(joaodasilva): This is only in place on official builds, but the # SetUserCloudPolicy call is a nop on official builds. Should be ADVANCED. @@ -122,7 +122,7 @@ class PolicyPrefsUITest(policy_base.PolicyTestBase): 'ProxyBypassList': ('localhost', [], [ 'win', 'mac', 'linux' ]), # Note: this policy is only used internally for now. 'ProxySettings': ({}, [], []), - 'EnableOriginBoundCerts': (False, []), + 'EnableOriginBoundCerts': (False, [], [ 'win', 'mac', 'linux' ]), 'DisableSSLRecordSplitting': (False, []), 'AuthSchemes': ('AuthSchemes', []), 'DisableAuthNegotiateCnameLookup': (True, []), @@ -200,7 +200,7 @@ class PolicyPrefsUITest(policy_base.PolicyTestBase): 'EnterpriseWebStoreURL': ('', []), 'EnterpriseWebStoreName': ('', []), 'EnableMemoryInfo': (True, []), - 'DisablePrintPreview': (True, []), + 'DisablePrintPreview': (True, [], [ 'win', 'mac', 'linux' ]), # ChromeOS-only policies: 'ChromeOsLockOnIdleSuspend': (True, [ PERSONAL ], [ 'chromeos' ]), |