summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-10 11:06:44 +0000
committerpastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-10 11:06:44 +0000
commitab0fb9834c6f3b3ee9d86a8c5a6ba3a5b69b2ac8 (patch)
treea073afc4f867fda75f62f0cffaedfd2c43155ef9
parentf37db1b9796f1c774566e8647280170f6b141414 (diff)
downloadchromium_src-ab0fb9834c6f3b3ee9d86a8c5a6ba3a5b69b2ac8.zip
chromium_src-ab0fb9834c6f3b3ee9d86a8c5a6ba3a5b69b2ac8.tar.gz
chromium_src-ab0fb9834c6f3b3ee9d86a8c5a6ba3a5b69b2ac8.tar.bz2
Added unittests for the newly introduced policy mappings.
BUG=None TEST=unit_tests - ConfigurationPolicyPref*, ConfigDir* Review URL: http://codereview.chromium.org/6592037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77624 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/policy/config_dir_policy_provider_unittest.cc12
-rw-r--r--chrome/browser/policy/configuration_policy_pref_store_unittest.cc8
-rw-r--r--chrome/browser/policy/configuration_policy_provider_mac_unittest.cc12
-rw-r--r--chrome/browser/policy/configuration_policy_provider_win_unittest.cc12
4 files changed, 44 insertions, 0 deletions
diff --git a/chrome/browser/policy/config_dir_policy_provider_unittest.cc b/chrome/browser/policy/config_dir_policy_provider_unittest.cc
index 860ba20..ae15a2c 100644
--- a/chrome/browser/policy/config_dir_policy_provider_unittest.cc
+++ b/chrome/browser/policy/config_dir_policy_provider_unittest.cc
@@ -337,6 +337,18 @@ INSTANTIATE_TEST_CASE_P(
kPolicyIncognitoEnabled,
key::kIncognitoEnabled),
ValueTestParams::ForBooleanPolicy(
+ kPolicyDisablePluginFinder,
+ key::kDisablePluginFinder),
+ ValueTestParams::ForBooleanPolicy(
+ kPolicyClearSiteDataOnExit,
+ key::kClearSiteDataOnExit),
+ ValueTestParams::ForStringPolicy(
+ kPolicyDownloadDirectory,
+ key::kDownloadDirectory),
+ ValueTestParams::ForBooleanPolicy(
+ kPolicyDefaultBrowserSettingEnabled,
+ key::kDefaultBrowserSettingEnabled),
+ ValueTestParams::ForBooleanPolicy(
kPolicyCloudPrintProxyEnabled,
key::kCloudPrintProxyEnabled)));
diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
index 33613de..1f21f9c 100644
--- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
@@ -121,6 +121,8 @@ INSTANTIATE_TEST_CASE_P(
prefs::kAuthServerWhitelist),
TypeAndName(kPolicyAuthNegotiateDelegateWhitelist,
prefs::kAuthNegotiateDelegateWhitelist),
+ TypeAndName(kPolicyDownloadDirectory,
+ prefs::kDownloadDefaultDirectory),
TypeAndName(kPolicyGSSAPILibraryName,
prefs::kGSSAPILibraryName)));
@@ -194,6 +196,12 @@ INSTANTIATE_TEST_CASE_P(
prefs::kEnableAuthNegotiatePort),
TypeAndName(kPolicyInstantEnabled,
prefs::kInstantEnabled),
+ TypeAndName(kPolicyDisablePluginFinder,
+ prefs::kDisablePluginFinder),
+ TypeAndName(kPolicyClearSiteDataOnExit,
+ prefs::kClearSiteDataOnExit),
+ TypeAndName(kPolicyDefaultBrowserSettingEnabled,
+ prefs::kDefaultBrowserSettingEnabled),
TypeAndName(kPolicyDisable3DAPIs,
prefs::kDisable3DAPIs)));
diff --git a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
index fc15aa7..0bcf002 100644
--- a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
@@ -308,6 +308,18 @@ INSTANTIATE_TEST_CASE_P(
kPolicyPolicyRefreshRate,
key::kPolicyRefreshRate),
PolicyTestParams::ForBooleanPolicy(
+ kPolicyDisablePluginFinder,
+ key::kDisablePluginFinder),
+ PolicyTestParams::ForBooleanPolicy(
+ kPolicyClearSiteDataOnExit,
+ key::kClearSiteDataOnExit),
+ PolicyTestParams::ForStringPolicy(
+ kPolicyDownloadDirectory,
+ key::kDownloadDirectory),
+ PolicyTestParams::ForBooleanPolicy(
+ kPolicyDefaultBrowserSettingEnabled,
+ key::kDefaultBrowserSettingEnabled),
+ PolicyTestParams::ForBooleanPolicy(
kPolicyCloudPrintProxyEnabled,
key::kCloudPrintProxyEnabled)));
diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
index b83474c..939912a 100644
--- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
@@ -466,6 +466,18 @@ INSTANTIATE_TEST_CASE_P(
kPolicyIncognitoEnabled,
key::kIncognitoEnabled),
PolicyTestParams::ForBooleanPolicy(
+ kPolicyDisablePluginFinder,
+ key::kDisablePluginFinder),
+ PolicyTestParams::ForBooleanPolicy(
+ kPolicyClearSiteDataOnExit,
+ key::kClearSiteDataOnExit),
+ PolicyTestParams::ForStringPolicy(
+ kPolicyDownloadDirectory,
+ key::kDownloadDirectory),
+ PolicyTestParams::ForBooleanPolicy(
+ kPolicyDefaultBrowserSettingEnabled,
+ key::kDefaultBrowserSettingEnabled),
+ PolicyTestParams::ForBooleanPolicy(
kPolicyCloudPrintProxyEnabled,
key::kCloudPrintProxyEnabled)));