Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: chrome/service/net/service_url_request_context.cc

Issue 10203002: Make URLRequestThrottlerManager a member of URLRequestContext. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge LKGR (pure merge) Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/service/net/service_url_request_context.h" 5 #include "chrome/service/net/service_url_request_context.h"
6 6
7 #if defined(OS_POSIX) && !defined(OS_MACOSX) 7 #if defined(OS_POSIX) && !defined(OS_MACOSX)
8 #include <sys/utsname.h> 8 #include <sys/utsname.h>
9 #endif 9 #endif
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/message_loop_proxy.h" 12 #include "base/message_loop_proxy.h"
13 #include "base/stringprintf.h" 13 #include "base/stringprintf.h"
14 #include "base/sys_info.h" 14 #include "base/sys_info.h"
15 #include "chrome/common/chrome_version_info.h" 15 #include "chrome/common/chrome_version_info.h"
16 #include "chrome/service/service_process.h" 16 #include "chrome/service/service_process.h"
17 #include "net/base/cert_verifier.h" 17 #include "net/base/cert_verifier.h"
18 #include "net/base/host_resolver.h" 18 #include "net/base/host_resolver.h"
19 #include "net/base/ssl_config_service_defaults.h" 19 #include "net/base/ssl_config_service_defaults.h"
20 #include "net/cookies/cookie_monster.h" 20 #include "net/cookies/cookie_monster.h"
21 #include "net/ftp/ftp_network_layer.h" 21 #include "net/ftp/ftp_network_layer.h"
22 #include "net/http/http_auth_handler_factory.h" 22 #include "net/http/http_auth_handler_factory.h"
23 #include "net/http/http_cache.h" 23 #include "net/http/http_cache.h"
24 #include "net/http/http_network_session.h" 24 #include "net/http/http_network_session.h"
25 #include "net/http/http_server_properties_impl.h" 25 #include "net/http/http_server_properties_impl.h"
26 #include "net/proxy/proxy_config_service.h" 26 #include "net/proxy/proxy_config_service.h"
27 #include "net/proxy/proxy_service.h" 27 #include "net/proxy/proxy_service.h"
28 #include "net/url_request/url_request_throttler_manager.h"
28 29
29 namespace { 30 namespace {
30 // Copied from webkit/glue/user_agent.cc. We don't want to pull in a dependency 31 // Copied from webkit/glue/user_agent.cc. We don't want to pull in a dependency
31 // on webkit/glue which also pulls in the renderer. Also our user-agent is 32 // on webkit/glue which also pulls in the renderer. Also our user-agent is
32 // totally different from the user-agent used by the browser, just the 33 // totally different from the user-agent used by the browser, just the
33 // OS-specific parts are common. 34 // OS-specific parts are common.
34 std::string BuildOSCpuInfo() { 35 std::string BuildOSCpuInfo() {
35 std::string os_cpu; 36 std::string os_cpu;
36 37
37 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) 38 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 NULL)); 116 NULL));
116 storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver( 117 storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver(
117 net_proxy_config_service, 0u, NULL)); 118 net_proxy_config_service, 0u, NULL));
118 storage_.set_cert_verifier(net::CertVerifier::CreateDefault()); 119 storage_.set_cert_verifier(net::CertVerifier::CreateDefault());
119 storage_.set_ftp_transaction_factory( 120 storage_.set_ftp_transaction_factory(
120 new net::FtpNetworkLayer(host_resolver())); 121 new net::FtpNetworkLayer(host_resolver()));
121 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); 122 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults);
122 storage_.set_http_auth_handler_factory( 123 storage_.set_http_auth_handler_factory(
123 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); 124 net::HttpAuthHandlerFactory::CreateDefault(host_resolver()));
124 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl); 125 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl);
126 storage_.set_throttler_manager(new net::URLRequestThrottlerManager);
125 127
126 net::HttpNetworkSession::Params session_params; 128 net::HttpNetworkSession::Params session_params;
127 session_params.host_resolver = host_resolver(); 129 session_params.host_resolver = host_resolver();
128 session_params.cert_verifier = cert_verifier(); 130 session_params.cert_verifier = cert_verifier();
129 session_params.proxy_service = proxy_service(); 131 session_params.proxy_service = proxy_service();
130 session_params.ssl_config_service = ssl_config_service(); 132 session_params.ssl_config_service = ssl_config_service();
131 session_params.http_auth_handler_factory = http_auth_handler_factory(); 133 session_params.http_auth_handler_factory = http_auth_handler_factory();
132 session_params.http_server_properties = http_server_properties(); 134 session_params.http_server_properties = http_server_properties();
133 scoped_refptr<net::HttpNetworkSession> network_session( 135 scoped_refptr<net::HttpNetworkSession> network_session(
134 new net::HttpNetworkSession(session_params)); 136 new net::HttpNetworkSession(session_params));
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 proxy_config_service_.release()); 178 proxy_config_service_.release());
177 return url_request_context_; 179 return url_request_context_;
178 } 180 }
179 181
180 scoped_refptr<base::MessageLoopProxy> 182 scoped_refptr<base::MessageLoopProxy>
181 ServiceURLRequestContextGetter::GetIOMessageLoopProxy() const { 183 ServiceURLRequestContextGetter::GetIOMessageLoopProxy() const {
182 return io_message_loop_proxy_; 184 return io_message_loop_proxy_;
183 } 185 }
184 186
185 ServiceURLRequestContextGetter::~ServiceURLRequestContextGetter() {} 187 ServiceURLRequestContextGetter::~ServiceURLRequestContextGetter() {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698