diff options
| author | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 19:16:53 +0000 |
|---|---|---|
| committer | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 19:16:53 +0000 |
| commit | 7bbb323426a3d67181d30c31707fca75e59e5272 (patch) | |
| tree | aef29f91af25ac253d07b049e2d4b5773a34f46e /chrome/test | |
| parent | 957f94835069fcd12c9669723210ecf124cf8805 (diff) | |
| download | chromium_src-7bbb323426a3d67181d30c31707fca75e59e5272.zip chromium_src-7bbb323426a3d67181d30c31707fca75e59e5272.tar.gz chromium_src-7bbb323426a3d67181d30c31707fca75e59e5272.tar.bz2 | |
Merge 114022 - Add a policy pref for the --enable-memory-info flag.
BUG=43281
TEST=Setting pref has same effect as running with --enable-memory-info.
Review URL: http://codereview.chromium.org/8896018
TBR=mmoss@chromium.org
Review URL: http://codereview.chromium.org/9076001
git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116163 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/data/enterprise/chrome-reverse.json | 1 | ||||
| -rw-r--r-- | chrome/test/data/enterprise/chrome.json | 1 | ||||
| -rwxr-xr-x | chrome/test/functional/policy_prefs_ui.py | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/chrome/test/data/enterprise/chrome-reverse.json b/chrome/test/data/enterprise/chrome-reverse.json index f47b6c6..ad5c6d7 100644 --- a/chrome/test/data/enterprise/chrome-reverse.json +++ b/chrome/test/data/enterprise/chrome-reverse.json @@ -22,6 +22,7 @@ "DnsPrefetchingEnabled": false, "EditBookmarksEnabled":false, "EnableAuthNegotiatePort": true, + "EnableMemoryInfo": true, "EnableOriginBoundCerts": true, "HomepageIsNewTabPage": false, "HomepageLocation": "http://chromium.org", diff --git a/chrome/test/data/enterprise/chrome.json b/chrome/test/data/enterprise/chrome.json index d0863ca..1ed2aaf 100644 --- a/chrome/test/data/enterprise/chrome.json +++ b/chrome/test/data/enterprise/chrome.json @@ -38,6 +38,7 @@ "DownloadDirectory": "Downloads", "EditBookmarksEnabled": true, "EnableAuthNegotiatePort": false, + "EnableMemoryInfo": false, "EnableOriginBoundCerts": false, "EnabledPlugins": ["Java"], "ExtensionInstallBlacklist": ["extension_id1", "extension_id2"], diff --git a/chrome/test/functional/policy_prefs_ui.py b/chrome/test/functional/policy_prefs_ui.py index 7ebcd7d..c035bf9 100755 --- a/chrome/test/functional/policy_prefs_ui.py +++ b/chrome/test/functional/policy_prefs_ui.py @@ -196,6 +196,7 @@ class PolicyPrefsUITest(policy_base.PolicyTestBase): 'URLWhitelist': ([ 'google.com' ], []), 'EnterpriseWebStoreURL': ('', []), 'EnterpriseWebStoreName': ('', []), + 'EnableMemoryInfo': (True, []), # ChromeOS-only policies: 'ChromeOsLockOnIdleSuspend': (True, [ PERSONAL ], [ 'chromeos' ]), |