summaryrefslogtreecommitdiffstats
path: root/chrome/service/net
diff options
context:
space:
mode:
authorscottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-05 23:35:24 +0000
committerscottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-05 23:35:24 +0000
commite68f7cf174e9f75f8c7d9d0298301f1690f441a1 (patch)
treed4998ee306d639e6d5fab2dbb724c1ef7c878e2a /chrome/service/net
parentea82636e9b774287332f7602f86b4ea5caaf4297 (diff)
downloadchromium_src-e68f7cf174e9f75f8c7d9d0298301f1690f441a1.zip
chromium_src-e68f7cf174e9f75f8c7d9d0298301f1690f441a1.tar.gz
chromium_src-e68f7cf174e9f75f8c7d9d0298301f1690f441a1.tar.bz2
Bring back service process throttler.
Somewhere along the way, the service process lost it's throttler. Under certain conditions (network going away) that meant that the service process could spin trying to access something, eating up CPU. BUG=140019 TEST=(Mac) Enable cloud print, disable network. Before this change, after 30 minutes, the Chromium Helper process would be >100% CPU in Activity Monitor. After this change, should be near nothing. Review URL: https://chromiumcodereview.appspot.com/10919102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service/net')
-rw-r--r--chrome/service/net/service_url_request_context.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc
index 1050e29..a7ab6f2 100644
--- a/chrome/service/net/service_url_request_context.cc
+++ b/chrome/service/net/service_url_request_context.cc
@@ -25,6 +25,7 @@
#include "net/http/http_server_properties_impl.h"
#include "net/proxy/proxy_config_service.h"
#include "net/proxy/proxy_service.h"
+#include "net/url_request/url_request_throttler_manager.h"
namespace {
// Copied from webkit/glue/user_agent.cc. We don't want to pull in a dependency
@@ -123,6 +124,7 @@ ServiceURLRequestContext::ServiceURLRequestContext(
net::HttpAuthHandlerFactory::CreateDefault(host_resolver()));
storage_.set_http_server_properties(new net::HttpServerPropertiesImpl);
storage_.set_transport_security_state(new net::TransportSecurityState);
+ storage_.set_throttler_manager(new net::URLRequestThrottlerManager);
net::HttpNetworkSession::Params session_params;
session_params.host_resolver = host_resolver();