OLD | NEW |
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 |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); | 116 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); |
117 storage_.set_http_auth_handler_factory( | 117 storage_.set_http_auth_handler_factory( |
118 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); | 118 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); |
119 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl); | 119 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl); |
120 storage_.set_transport_security_state(new net::TransportSecurityState); | 120 storage_.set_transport_security_state(new net::TransportSecurityState); |
121 storage_.set_throttler_manager(new net::URLRequestThrottlerManager); | 121 storage_.set_throttler_manager(new net::URLRequestThrottlerManager); |
122 | 122 |
123 net::HttpNetworkSession::Params session_params; | 123 net::HttpNetworkSession::Params session_params; |
124 session_params.host_resolver = host_resolver(); | 124 session_params.host_resolver = host_resolver(); |
125 session_params.cert_verifier = cert_verifier(); | 125 session_params.cert_verifier = cert_verifier(); |
| 126 session_params.transport_security_state = transport_security_state(); |
126 session_params.proxy_service = proxy_service(); | 127 session_params.proxy_service = proxy_service(); |
127 session_params.ssl_config_service = ssl_config_service(); | 128 session_params.ssl_config_service = ssl_config_service(); |
128 session_params.http_auth_handler_factory = http_auth_handler_factory(); | 129 session_params.http_auth_handler_factory = http_auth_handler_factory(); |
129 session_params.http_server_properties = http_server_properties(); | 130 session_params.http_server_properties = http_server_properties(); |
130 scoped_refptr<net::HttpNetworkSession> network_session( | 131 scoped_refptr<net::HttpNetworkSession> network_session( |
131 new net::HttpNetworkSession(session_params)); | 132 new net::HttpNetworkSession(session_params)); |
132 storage_.set_http_transaction_factory(new net::HttpCache( | 133 storage_.set_http_transaction_factory(new net::HttpCache( |
133 network_session.get(), net::HttpCache::DefaultBackend::InMemory(0))); | 134 network_session.get(), net::HttpCache::DefaultBackend::InMemory(0))); |
134 // In-memory cookie store. | 135 // In-memory cookie store. |
135 storage_.set_cookie_store(new net::CookieMonster(NULL, NULL)); | 136 storage_.set_cookie_store(new net::CookieMonster(NULL, NULL)); |
(...skipping 26 matching lines...) Expand all Loading... |
162 proxy_config_service_.release())); | 163 proxy_config_service_.release())); |
163 return url_request_context_.get(); | 164 return url_request_context_.get(); |
164 } | 165 } |
165 | 166 |
166 scoped_refptr<base::SingleThreadTaskRunner> | 167 scoped_refptr<base::SingleThreadTaskRunner> |
167 ServiceURLRequestContextGetter::GetNetworkTaskRunner() const { | 168 ServiceURLRequestContextGetter::GetNetworkTaskRunner() const { |
168 return network_task_runner_; | 169 return network_task_runner_; |
169 } | 170 } |
170 | 171 |
171 ServiceURLRequestContextGetter::~ServiceURLRequestContextGetter() {} | 172 ServiceURLRequestContextGetter::~ServiceURLRequestContextGetter() {} |
OLD | NEW |