summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/policy/policy_templates.json18
-rw-r--r--chrome/browser/browser_main.cc12
-rw-r--r--chrome/browser/browser_main.h3
-rw-r--r--chrome/browser/browser_process_impl.cc10
-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
-rw-r--r--chrome/common/pref_names.cc1
-rw-r--r--chrome/common/pref_names.h1
-rw-r--r--net/socket/client_socket_pool_manager.cc4
-rw-r--r--net/socket/client_socket_pool_manager.h2
12 files changed, 9 insertions, 60 deletions
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index ab98226..6e7e6cd 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -94,7 +94,7 @@
# persistent IDs for all fields (but not for groups!) are needed. These are
# specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs,
# because doing so would break the deployed wire format!
-# For your editing convenience: highest ID currently used: 92
+# For your editing convenience: highest ID currently used: 91
#
# Placeholders:
# The following placeholder strings are automatically substituted:
@@ -1593,22 +1593,6 @@
'caption': '''Release channel''',
'desc': '''Specifies the release channel that this device should be locked to. This policy is a work in progress; currently, the user can still change the release channel even if it's specified by the policy.'''
},
- {
- 'name': 'MaxConnectionsPerProxy',
- 'type': 'int',
- 'supported_on': ['chrome_os:1.0-','chrome.*:14-'],
- 'features': {'dynamic_refresh': 0},
- 'example_value': 32,
- 'id': 92,
- 'caption': '''Maximal number of concurrent connections to the proxy server''',
- 'desc': '''Specifies the maximal number of simultanious connections to the proxy server.
-
- Some proxy servers can not handle high number of concurrent connections per client and this can be solved by setting this policy to a lower value.
-
- The value of this policy should be lower than 100 and higher than 6 and the default value is 32.
-
- Some web apps are known to consume many connections with hanging GETs, so lowering below 32 may lead to browser networking hangs if too many such web apps are open. Lower below the default at your own risk.''',
- },
],
'messages': {
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index d79e4f4..d31fe38 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -277,9 +277,7 @@ MetricsService* BrowserMainParts::SetupMetricsAndFieldTrials(
// to send metrics.
field_trial_list_.reset(new base::FieldTrialList(metrics->GetClientId()));
- SetupFieldTrials(metrics->recording_active(),
- local_state->IsManagedPreference(
- prefs::kMaxConnectionsPerProxy));
+ SetupFieldTrials(metrics->recording_active());
// Initialize FieldTrialSynchronizer system. This is a singleton and is used
// for posting tasks via NewRunnableMethod. Its deleted when it goes out of
@@ -635,8 +633,7 @@ MetricsService* BrowserMainParts::InitializeMetrics(
return metrics;
}
-void BrowserMainParts::SetupFieldTrials(bool metrics_recording_enabled,
- bool proxy_policy_is_set) {
+void BrowserMainParts::SetupFieldTrials(bool metrics_recording_enabled) {
if (metrics_recording_enabled)
chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Start();
@@ -644,10 +641,7 @@ void BrowserMainParts::SetupFieldTrials(bool metrics_recording_enabled,
// ProxyConnectionsFieldTrial().
ConnectionFieldTrial();
SocketTimeoutFieldTrial();
- // If a policy is defining the number of active connections this field test
- // shoud not be performed.
- if (!proxy_policy_is_set)
- ProxyConnectionsFieldTrial();
+ ProxyConnectionsFieldTrial();
prerender::ConfigurePrefetchAndPrerender(parsed_command_line());
SpdyFieldTrial();
ConnectBackupJobsFieldTrial();
diff --git a/chrome/browser/browser_main.h b/chrome/browser/browser_main.h
index 85dce6f..e13a12d 100644
--- a/chrome/browser/browser_main.h
+++ b/chrome/browser/browser_main.h
@@ -147,8 +147,7 @@ class BrowserMainParts {
const PrefService* local_state);
// Add an invocation of your field trial init function to this method.
- void SetupFieldTrials(bool metrics_recording_enabled,
- bool proxy_policy_is_set);
+ void SetupFieldTrials(bool metrics_recording_enabled);
// Members initialized on construction ---------------------------------------
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index b616348..f99f38b 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -77,7 +77,6 @@
#include "content/browser/renderer_host/resource_dispatcher_host.h"
#include "content/common/notification_service.h"
#include "ipc/ipc_logging.h"
-#include "net/socket/client_socket_pool_manager.h"
#include "net/url_request/url_request_context_getter.h"
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/l10n/l10n_util.h"
@@ -850,15 +849,6 @@ void BrowserProcessImpl::CreateLocalState() {
// able so we need to have it when initializing the profiles.
local_state_->RegisterFilePathPref(prefs::kDiskCacheDir, FilePath());
- // Another policy that needs to be defined before the net subsystem is
- // initialized is MaxConnectionsPerProxy so we do it here.
- local_state_->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy,
- net::kDefaultMaxSocketsPerProxyServer);
- int max_per_proxy = local_state_->GetInteger(prefs::kMaxConnectionsPerProxy);
- net::ClientSocketPoolManager::set_max_sockets_per_proxy_server(
- std::max(std::min(max_per_proxy, 99),
- net::ClientSocketPoolManager::max_sockets_per_group()));
-
// This is observed by ChildProcessSecurityPolicy, which lives in content/
// though, so it can't register itself.
local_state_->RegisterListPref(prefs::kDisabledSchemes);
diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc
index cf44547..3e62c8d 100644
--- a/chrome/browser/policy/configuration_policy_pref_store.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store.cc
@@ -274,8 +274,6 @@ 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,
@@ -1067,8 +1065,6 @@ 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 ca1449f..d209228 100644
--- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
@@ -273,9 +273,7 @@ INSTANTIATE_TEST_CASE_P(
TypeAndName(kPolicyRestoreOnStartup,
prefs::kRestoreOnStartup),
TypeAndName(kPolicyPolicyRefreshRate,
- prefs::kUserPolicyRefreshRate),
- TypeAndName(kPolicyMaxConnectionsPerProxy,
- prefs::kMaxConnectionsPerProxy)));
+ prefs::kUserPolicyRefreshRate)));
// 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 3a486cf..668492d 100644
--- a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc
@@ -345,9 +345,6 @@ INSTANTIATE_TEST_CASE_P(
key::kDisabledSchemes),
PolicyTestParams::ForStringPolicy(
kPolicyDiskCacheDir,
- key::kDiskCacheDir),
- PolicyTestParams::ForIntegerPolicy(
- kPolicyMaxConnectionsPerProxy,
- key::kMaxConnectionsPerProxy)));
+ key::kDiskCacheDir)));
} // 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 b2cc3ce..b14e5b5 100644
--- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
@@ -503,9 +503,6 @@ INSTANTIATE_TEST_CASE_P(
key::kDisabledSchemes),
PolicyTestParams::ForStringPolicy(
kPolicyDiskCacheDir,
- key::kDiskCacheDir),
- PolicyTestParams::ForIntegerPolicy(
- kPolicyMaxConnectionsPerProxy,
- key::kMaxConnectionsPerProxy)));
+ key::kDiskCacheDir)));
} // namespace policy
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index f2c6ad6..d6b6745 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -1322,7 +1322,6 @@ const char kCloudPrintRobotEmail[] = "cloud_print.robot_email";
// Preference to story proxy settings.
const char kProxy[] = "proxy";
-const char kMaxConnectionsPerProxy[] = "net.max_connections_per_proxy";
// Preferences that are exclusivly used to store managed values for default
// content settings.
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 386d126..2dd53b1 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -456,7 +456,6 @@ extern const char kCloudPrintRobotRefreshToken[];
extern const char kCloudPrintRobotEmail[];
extern const char kProxy[];
-extern const char kMaxConnectionsPerProxy[];
extern const char kManagedDefaultCookiesSetting[];
extern const char kManagedDefaultImagesSetting[];
diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
index 1c4bd3f..f26f876 100644
--- a/net/socket/client_socket_pool_manager.cc
+++ b/net/socket/client_socket_pool_manager.cc
@@ -27,8 +27,6 @@
namespace net {
-const int kDefaultMaxSocketsPerProxyServer = 32;
-
namespace {
// Total limit of sockets.
@@ -42,7 +40,7 @@ int g_max_sockets_per_group = 6;
// The max number of sockets to allow per proxy server. This applies both to
// http and SOCKS proxies. See http://crbug.com/12066 and
// http://crbug.com/44501 for details about proxy server connection limits.
-int g_max_sockets_per_proxy_server = kDefaultMaxSocketsPerProxyServer;
+int g_max_sockets_per_proxy_server = 32;
// Appends information about all |socket_pools| to the end of |list|.
template <class MapType>
diff --git a/net/socket/client_socket_pool_manager.h b/net/socket/client_socket_pool_manager.h
index 281be17..5ef70f0 100644
--- a/net/socket/client_socket_pool_manager.h
+++ b/net/socket/client_socket_pool_manager.h
@@ -51,8 +51,6 @@ class TransportClientSocketPool;
struct SSLConfig;
-extern const int kDefaultMaxSocketsPerProxyServer;
-
namespace internal {
// A helper class for auto-deleting Values in the destructor.
generated by cgit v1.1 at 2025-02-06 23:08:26 +0000