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

Unified Diff: chrome_frame/test/policy_settings_unittest.cc

Issue 17153006: Chrome Frame turndown prompt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to r208076 Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/resources/chrome_frame_dialogs.grd ('k') | chrome_frame/turndown_prompt/reshow_state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/policy_settings_unittest.cc
diff --git a/chrome_frame/test/policy_settings_unittest.cc b/chrome_frame/test/policy_settings_unittest.cc
index c5062bd0058cfadf91064f190efc4369515fad7f..0872b83830bd53c2adc37351a2817648cce0d078 100644
--- a/chrome_frame/test/policy_settings_unittest.cc
+++ b/chrome_frame/test/policy_settings_unittest.cc
@@ -30,7 +30,9 @@ void DeleteChromeFramePolicyEntries(HKEY root) {
key.DeleteKey(ASCIIToWide(policy::key::kRenderInChromeFrameList).c_str());
key.DeleteKey(ASCIIToWide(policy::key::kRenderInHostList).c_str());
key.DeleteKey(ASCIIToWide(policy::key::kChromeFrameContentTypes).c_str());
- key.DeleteKey(ASCIIToWide(policy::key::kApplicationLocaleValue).c_str());
+ key.DeleteValue(ASCIIToWide(policy::key::kApplicationLocaleValue).c_str());
+ key.DeleteValue(
+ ASCIIToWide(policy::key::kSuppressChromeFrameTurndownPrompt).c_str());
}
}
@@ -104,6 +106,17 @@ bool SetCFPolicyString(HKEY policy_root,
return true;
}
+void SetCFPolicyBool(HKEY policy_root,
+ const char* policy_name,
+ bool value) {
+ RegKey policy_key;
+ if (InitializePolicyKey(policy_root, &policy_key)) {
+ std::wstring policy_name_str(ASCIIToWide(policy_name));
+ EXPECT_EQ(ERROR_SUCCESS,
+ policy_key.WriteValue(policy_name_str.c_str(), value ? 1U : 0U));
+ }
+}
+
} // end namespace
class PolicySettingsTest : public testing::Test {
@@ -246,3 +259,17 @@ TEST_F(PolicySettingsTest, AdditionalLaunchParameters) {
DeleteChromeFramePolicyEntries(root[i]);
}
}
+
+TEST_F(PolicySettingsTest, SuppressTurndownPrompt) {
+ EXPECT_FALSE(PolicySettings::GetInstance()->suppress_turndown_prompt());
+
+ HKEY root[] = { HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER };
+ for (int i = 0; i < arraysize(root); ++i) {
+ SetCFPolicyBool(root[i], policy::key::kSuppressChromeFrameTurndownPrompt,
+ true);
+ ResetPolicySettings();
+ EXPECT_TRUE(PolicySettings::GetInstance()->suppress_turndown_prompt());
+
+ DeleteChromeFramePolicyEntries(root[i]);
+ }
+}
« no previous file with comments | « chrome_frame/resources/chrome_frame_dialogs.grd ('k') | chrome_frame/turndown_prompt/reshow_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698