OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/cookie_monster.h" | 18 #include "net/base/cookie_monster.h" |
19 #include "net/base/dnsrr_resolver.h" | 19 #include "net/base/dnsrr_resolver.h" |
20 #include "net/base/host_resolver.h" | 20 #include "net/base/host_resolver.h" |
21 #include "net/base/ssl_config_service_defaults.h" | 21 #include "net/base/ssl_config_service_defaults.h" |
22 #include "net/ftp/ftp_network_layer.h" | 22 #include "net/ftp/ftp_network_layer.h" |
23 #include "net/http/http_auth_handler_factory.h" | 23 #include "net/http/http_auth_handler_factory.h" |
24 #include "net/http/http_cache.h" | 24 #include "net/http/http_cache.h" |
25 #include "net/http/http_network_session.h" | 25 #include "net/http/http_network_session.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/spdy/spdy_config_service_defaults.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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 storage_.set_host_resolver( | 113 storage_.set_host_resolver( |
113 net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, | 114 net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, |
114 net::HostResolver::kDefaultRetryAttempts, | 115 net::HostResolver::kDefaultRetryAttempts, |
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(new net::CertVerifier); | 119 storage_.set_cert_verifier(new net::CertVerifier); |
119 storage_.set_dnsrr_resolver(new net::DnsRRResolver); | 120 storage_.set_dnsrr_resolver(new net::DnsRRResolver); |
120 storage_.set_ftp_transaction_factory( | 121 storage_.set_ftp_transaction_factory( |
121 new net::FtpNetworkLayer(host_resolver())); | 122 new net::FtpNetworkLayer(host_resolver())); |
| 123 storage_.set_spdy_config_service(new net::SpdyConfigServiceDefaults); |
122 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); | 124 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); |
123 storage_.set_http_auth_handler_factory( | 125 storage_.set_http_auth_handler_factory( |
124 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); | 126 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); |
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.dnsrr_resolver = dnsrr_resolver(); | 131 session_params.dnsrr_resolver = dnsrr_resolver(); |
130 session_params.proxy_service = proxy_service(); | 132 session_params.proxy_service = proxy_service(); |
| 133 session_params.spdy_config_service = spdy_config_service(); |
131 session_params.ssl_config_service = ssl_config_service(); | 134 session_params.ssl_config_service = ssl_config_service(); |
132 session_params.http_auth_handler_factory = http_auth_handler_factory(); | 135 session_params.http_auth_handler_factory = http_auth_handler_factory(); |
133 scoped_refptr<net::HttpNetworkSession> network_session( | 136 scoped_refptr<net::HttpNetworkSession> network_session( |
134 new net::HttpNetworkSession(session_params)); | 137 new net::HttpNetworkSession(session_params)); |
135 storage_.set_http_transaction_factory( | 138 storage_.set_http_transaction_factory( |
136 new net::HttpCache( | 139 new net::HttpCache( |
137 network_session, | 140 network_session, |
138 net::HttpCache::DefaultBackend::InMemory(0))); | 141 net::HttpCache::DefaultBackend::InMemory(0))); |
139 // In-memory cookie store. | 142 // In-memory cookie store. |
140 storage_.set_cookie_store(new net::CookieMonster(NULL, NULL)); | 143 storage_.set_cookie_store(new net::CookieMonster(NULL, NULL)); |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
176 proxy_config_service_.release()); | 179 proxy_config_service_.release()); |
177 return url_request_context_; | 180 return url_request_context_; |
178 } | 181 } |
179 | 182 |
180 scoped_refptr<base::MessageLoopProxy> | 183 scoped_refptr<base::MessageLoopProxy> |
181 ServiceURLRequestContextGetter::GetIOMessageLoopProxy() const { | 184 ServiceURLRequestContextGetter::GetIOMessageLoopProxy() const { |
182 return io_message_loop_proxy_; | 185 return io_message_loop_proxy_; |
183 } | 186 } |
184 | 187 |
185 ServiceURLRequestContextGetter::~ServiceURLRequestContextGetter() {} | 188 ServiceURLRequestContextGetter::~ServiceURLRequestContextGetter() {} |
OLD | NEW |