summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_process_impl.cc
diff options
context:
space:
mode:
authorjohnme@google.com <johnme@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-08 12:33:39 +0000
committerjohnme@google.com <johnme@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-08 12:33:39 +0000
commitffe739fd4a4454bab12d5d317b7342b6be6d847a (patch)
tree6fe76da518e79cf590ea36bf054ad8b0a64109be /chrome/browser/browser_process_impl.cc
parent2c094d8030adf129b35076b75399f920dc082792 (diff)
downloadchromium_src-ffe739fd4a4454bab12d5d317b7342b6be6d847a.zip
chromium_src-ffe739fd4a4454bab12d5d317b7342b6be6d847a.tar.gz
chromium_src-ffe739fd4a4454bab12d5d317b7342b6be6d847a.tar.bz2
Revert 91842 - Introduce a policy to control the maximal number of connections per proxy server.
Reverted commit details: BUG=63658 TEST=All policy unit_tests should pass. Review URL: http://codereview.chromium.org/7283018 TBR=pastarmovj@chromium.org Review URL: http://codereview.chromium.org/7326011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
-rw-r--r--chrome/browser/browser_process_impl.cc10
1 files changed, 0 insertions, 10 deletions
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);