diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 13:14:50 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 13:14:50 +0000 |
| commit | 6fd9df6e95ede5d08f70bade7bc36767739865d5 (patch) | |
| tree | 7ac69d3bf44d7e02572bad29650829564add1076 /chrome_frame/test/policy_settings_unittest.cc | |
| parent | 3fc40c14495f094dbb47ae4237e8d013304de0f4 (diff) | |
| download | chromium_src-6fd9df6e95ede5d08f70bade7bc36767739865d5.zip chromium_src-6fd9df6e95ede5d08f70bade7bc36767739865d5.tar.gz chromium_src-6fd9df6e95ede5d08f70bade7bc36767739865d5.tar.bz2 | |
Added recommended pref store on Windows.
BUG=49941
TEST=Set policies for Chromium/Chrome in a registry subkey named "Recommended". Those policies become the default values and can be overridden by the user.
Review URL: http://codereview.chromium.org/8551010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/policy_settings_unittest.cc')
| -rw-r--r-- | chrome_frame/test/policy_settings_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/test/policy_settings_unittest.cc b/chrome_frame/test/policy_settings_unittest.cc index 99d970f..f3d5e12 100644 --- a/chrome_frame/test/policy_settings_unittest.cc +++ b/chrome_frame/test/policy_settings_unittest.cc @@ -22,7 +22,7 @@ namespace { // A best effort way to zap CF policy entries that may be in the registry. void DeleteChromeFramePolicyEntries(HKEY root) { RegKey key; - if (key.Open(root, policy::kRegistrySubKey, + if (key.Open(root, policy::kRegistryMandatorySubKey, KEY_ALL_ACCESS) == ERROR_SUCCESS) { key.DeleteValue( ASCIIToWide(policy::key::kChromeFrameRendererSettings).c_str()); @@ -35,7 +35,7 @@ void DeleteChromeFramePolicyEntries(HKEY root) { bool InitializePolicyKey(HKEY policy_root, RegKey* policy_key) { EXPECT_EQ(ERROR_SUCCESS, policy_key->Create(policy_root, - policy::kRegistrySubKey, KEY_ALL_ACCESS)); + policy::kRegistryMandatorySubKey, KEY_ALL_ACCESS)); return policy_key->Valid(); } |