summaryrefslogtreecommitdiffstats
path: root/chrome/browser/policy
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/policy')
-rw-r--r--chrome/browser/policy/configuration_policy_pref_store.cc4
-rw-r--r--chrome/browser/policy/configuration_policy_pref_store_unittest.cc4
-rw-r--r--chrome/browser/policy/configuration_policy_provider_mac_unittest.cc5
-rw-r--r--chrome/browser/policy/configuration_policy_provider_win_unittest.cc5
4 files changed, 15 insertions, 3 deletions
diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc
index 3e62c8d..cf44547 100644
--- a/chrome/browser/policy/configuration_policy_pref_store.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store.cc
@@ -274,6 +274,8 @@ const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry
prefs::kEditBookmarksEnabled },
{ Value::TYPE_BOOLEAN, kPolicyAllowFileSelectionDialogs,
prefs::kAllowFileSelectionDialogs },
+ { Value::TYPE_INTEGER, kPolicyMaxConnectionsPerProxy,
+ prefs::kMaxConnectionsPerProxy },
#if defined(OS_CHROMEOS)
{ Value::TYPE_BOOLEAN, kPolicyChromeOsLockOnIdleSuspend,
@@ -1065,6 +1067,8 @@ ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() {
key::kAllowFileSelectionDialogs },
{ kPolicyDiskCacheDir, Value::TYPE_STRING,
key::kDiskCacheDir },
+ { kPolicyMaxConnectionsPerProxy, Value::TYPE_INTEGER,
+ key::kMaxConnectionsPerProxy },
#if defined(OS_CHROMEOS)
{ kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN,
diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
index d209228..ca1449f 100644
--- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
@@ -273,7 +273,9 @@ INSTANTIATE_TEST_CASE_P(
TypeAndName(kPolicyRestoreOnStartup,
prefs::kRestoreOnStartup),
TypeAndName(kPolicyPolicyRefreshRate,
- prefs::kUserPolicyRefreshRate)));
+ prefs::kUserPolicyRefreshRate),
+ TypeAndName(kPolicyMaxConnectionsPerProxy,
+ prefs::kMaxConnectionsPerProxy)));
// Test cases for the proxy policy settings.
class ConfigurationPolicyPrefStoreProxyTest : public testing::Test {
diff --git a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
index 668492d..3a486cf 100644
--- a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
@@ -345,6 +345,9 @@ INSTANTIATE_TEST_CASE_P(
key::kDisabledSchemes),
PolicyTestParams::ForStringPolicy(
kPolicyDiskCacheDir,
- key::kDiskCacheDir)));
+ key::kDiskCacheDir),
+ PolicyTestParams::ForIntegerPolicy(
+ kPolicyMaxConnectionsPerProxy,
+ key::kMaxConnectionsPerProxy)));
} // namespace policy
diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
index b14e5b5..b2cc3ce 100644
--- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
@@ -503,6 +503,9 @@ INSTANTIATE_TEST_CASE_P(
key::kDisabledSchemes),
PolicyTestParams::ForStringPolicy(
kPolicyDiskCacheDir,
- key::kDiskCacheDir)));
+ key::kDiskCacheDir),
+ PolicyTestParams::ForIntegerPolicy(
+ kPolicyMaxConnectionsPerProxy,
+ key::kMaxConnectionsPerProxy)));
} // namespace policy