Skip to content

Commit

Permalink
Modify registry and json files to add policies for testing popups.
Browse files Browse the repository at this point in the history
BUG=NONE
TEST=enterprise.EnterpriseTest.testDisablePopups, enterprise.EnterpriseTestReverse.testEnablePopups

Review URL: http://codereview.chromium.org/7629008
Patch from aocampo <aocampo@chromium.org>.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96813 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
nirnimesh@chromium.org committed Aug 15, 2011
1 parent f2e29a7 commit 0b802d3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion chrome/test/data/enterprise/chrome-add-reverse.reg
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Windows Registry Editor Version 5.00

[HKEY_LOCAL_MACHINE\Software\Policies\Google\Chrome]
"DefaultCookiesSetting"=dword:0
"DefaultPopupsSetting"=dword:1
"ClearSiteDataOnExit"=dword:0
"BlockThirdPartyCookies"=dword:0

Expand All @@ -26,7 +27,7 @@ Windows Registry Editor Version 5.00
"DnsPrefetchingEnabled"=dword:0
"IncognitoEnabled"=dword:0
"InstantEnabled"=dword:0
"JavascriptEnabled"=dword:0
"JavascriptEnabled"=dword:1
"MetricsReportingEnabled"=dword:0
"PrintingEnabled"=dword:0
"SafeBrowsingEnabled"=dword:0
Expand Down
Binary file modified chrome/test/data/enterprise/chrome-add.reg
Binary file not shown.
2 changes: 1 addition & 1 deletion chrome/test/data/enterprise/chrome-reverse.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"HomepageLocation": "http://chromium.org",
"IncognitoEnabled": false,
"InstantEnabled": false,
"JavascriptEnabled": false,
"JavascriptEnabled": true,
"MetricsReportingEnabled": false,
"PasswordManagerAllowShowPasswords": true,
"PasswordManagerEnabled": false,
Expand Down
4 changes: 2 additions & 2 deletions chrome/test/data/enterprise/chrome.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"DefaultJavaScriptSetting": 0,
"DefaultNotificationSetting": 2,
"DefaultPluginsSetting": 0,
"DefaultPopupsSetting": 1,
"DefaultPopupsSetting": 2,
"DefaultSearchProviderEnabled": true,
"DefaultSearchProviderEncodings": ["UTF-8", "UTF-16", "GB2312", "ISO-8859-1"],
"DefaultSearchProviderIconURL": "http://search.my.company/favicon.ico",
Expand All @@ -39,7 +39,7 @@
"EnableAuthNegotiatePort": false,
"EnabledPlugins": ["Java"],
"ExtensionInstallBlacklist": ["extension_id1", "extension_id2"],
"ExtensionInstallForcelist": ["lcncmkcnkcdbbanbjakcencbaoegdjlp;https://clients2.google.com/service/update2/crx"],
"ExtensionInstallForcelist": ["extension_id1;https://clients2.google.com/service/update2/crx"],
"ExtensionInstallWhitelist": ["extension_id1", "extension_id2"],
"GSSAPILibraryName": "libgssapi_krb5.so.2",
"HomepageIsNewTabPage": true,
Expand Down

0 comments on commit 0b802d3

Please sign in to comment.