diff options
| author | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-08 12:17:18 +0000 |
|---|---|---|
| committer | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-08 12:17:18 +0000 |
| commit | 2c094d8030adf129b35076b75399f920dc082792 (patch) | |
| tree | 218c2caf61e12d996b5a609f436ae18717521a05 /chrome/browser/policy | |
| parent | 94071506bbaae97bf587e70eb11d76028af14a95 (diff) | |
| download | chromium_src-2c094d8030adf129b35076b75399f920dc082792.zip chromium_src-2c094d8030adf129b35076b75399f920dc082792.tar.gz chromium_src-2c094d8030adf129b35076b75399f920dc082792.tar.bz2 | |
Introduce a policy to control the maximal number of connections per proxy server.
BUG=63658
TEST=All policy unit_tests should pass.
Review URL: http://codereview.chromium.org/7283018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy')
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 |