Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: chrome_frame/test/policy_settings_unittest.cc

Issue 7669061: Tommi: I need an owner review for the chrome frame changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixing license issue from presubmit check Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome_frame/test/chrome_frame_test_utils.cc ('k') | chrome_frame/test/util_unittests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/at_exit.h" 6 #include "base/at_exit.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "base/win/registry.h" 11 #include "base/win/registry.h"
12 #include "chrome_frame/policy_settings.h" 12 #include "chrome_frame/policy_settings.h"
13 #include "chrome_frame/test/chrome_frame_test_utils.h" 13 #include "chrome_frame/test/chrome_frame_test_utils.h"
14 #include "policy/policy_constants.h" 14 #include "policy/policy_constants.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 using base::win::RegKey; 17 using base::win::RegKey;
18 using chrome_frame_test::ScopedVirtualizeHklmAndHkcu; 18 using chrome_frame_test::ScopedVirtualizeHklmAndHkcu;
19 using chrome_frame_test::TempRegKeyOverride;
20 19
21 namespace { 20 namespace {
22 21
23 // A best effort way to zap CF policy entries that may be in the registry. 22 // A best effort way to zap CF policy entries that may be in the registry.
24 void DeleteChromeFramePolicyEntries(HKEY root) { 23 void DeleteChromeFramePolicyEntries(HKEY root) {
25 RegKey key; 24 RegKey key;
26 if (key.Open(root, policy::kRegistrySubKey, 25 if (key.Open(root, policy::kRegistrySubKey,
27 KEY_ALL_ACCESS) == ERROR_SUCCESS) { 26 KEY_ALL_ACCESS) == ERROR_SUCCESS) {
28 key.DeleteValue( 27 key.DeleteValue(
29 ASCIIToWide(policy::key::kChromeFrameRendererSettings).c_str()); 28 ASCIIToWide(policy::key::kChromeFrameRendererSettings).c_str());
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 HKEY root[] = { HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER }; 207 HKEY root[] = { HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER };
209 for (int i = 0; i < arraysize(root); ++i) { 208 for (int i = 0; i < arraysize(root); ++i) {
210 SetChromeApplicationLocale(root[i], kTestApplicationLocale); 209 SetChromeApplicationLocale(root[i], kTestApplicationLocale);
211 ResetPolicySettings(); 210 ResetPolicySettings();
212 EXPECT_EQ(std::wstring(kTestApplicationLocale), 211 EXPECT_EQ(std::wstring(kTestApplicationLocale),
213 PolicySettings::GetInstance()->ApplicationLocale()); 212 PolicySettings::GetInstance()->ApplicationLocale());
214 213
215 DeleteChromeFramePolicyEntries(root[i]); 214 DeleteChromeFramePolicyEntries(root[i]);
216 } 215 }
217 } 216 }
OLDNEW
« no previous file with comments | « chrome_frame/test/chrome_frame_test_utils.cc ('k') | chrome_frame/test/util_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698