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 "net/url_request/url_request_context_builder.h" | 5 #include "net/url_request/url_request_context_builder.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/single_thread_task_runner.h" | 12 #include "base/single_thread_task_runner.h" |
13 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
14 #include "base/thread_task_runner_handle.h" | 14 #include "base/thread_task_runner_handle.h" |
15 #include "base/threading/thread.h" | 15 #include "base/threading/thread.h" |
16 #include "net/base/cache_type.h" | 16 #include "net/base/cache_type.h" |
17 #include "net/base/net_errors.h" | 17 #include "net/base/net_errors.h" |
18 #include "net/base/network_delegate_impl.h" | 18 #include "net/base/network_delegate_impl.h" |
19 #include "net/base/sdch_manager.h" | 19 #include "net/base/sdch_manager.h" |
20 #include "net/cert/cert_verifier.h" | 20 #include "net/cert/cert_verifier.h" |
21 #include "net/cookies/cookie_monster.h" | 21 #include "net/cookies/cookie_monster.h" |
22 #include "net/dns/host_resolver.h" | 22 #include "net/dns/host_resolver.h" |
23 #include "net/ftp/ftp_network_layer.h" | 23 #include "net/ftp/ftp_network_layer.h" |
24 #include "net/http/http_auth_handler_factory.h" | 24 #include "net/http/http_auth_handler_factory.h" |
25 #include "net/http/http_cache.h" | 25 #include "net/http/http_cache.h" |
26 #include "net/http/http_network_layer.h" | 26 #include "net/http/http_network_layer.h" |
27 #include "net/http/http_network_session.h" | 27 #include "net/http/http_network_session.h" |
28 #include "net/http/http_server_properties_impl.h" | 28 #include "net/http/http_server_properties_impl.h" |
| 29 #include "net/http/http_server_properties_manager.h" |
29 #include "net/http/transport_security_persister.h" | 30 #include "net/http/transport_security_persister.h" |
30 #include "net/http/transport_security_state.h" | 31 #include "net/http/transport_security_state.h" |
31 #include "net/ssl/channel_id_service.h" | 32 #include "net/ssl/channel_id_service.h" |
32 #include "net/ssl/default_channel_id_store.h" | 33 #include "net/ssl/default_channel_id_store.h" |
33 #include "net/ssl/ssl_config_service_defaults.h" | 34 #include "net/ssl/ssl_config_service_defaults.h" |
34 #include "net/url_request/data_protocol_handler.h" | 35 #include "net/url_request/data_protocol_handler.h" |
35 #include "net/url_request/static_http_user_agent_settings.h" | 36 #include "net/url_request/static_http_user_agent_settings.h" |
36 #include "net/url_request/url_request_context.h" | 37 #include "net/url_request/url_request_context.h" |
37 #include "net/url_request/url_request_context_storage.h" | 38 #include "net/url_request/url_request_context_storage.h" |
38 #include "net/url_request/url_request_intercepting_job_factory.h" | 39 #include "net/url_request/url_request_intercepting_job_factory.h" |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 file_task_runner_ = file_thread_->task_runner(); | 150 file_task_runner_ = file_thread_->task_runner(); |
150 } | 151 } |
151 return file_task_runner_; | 152 return file_task_runner_; |
152 } | 153 } |
153 | 154 |
154 void set_transport_security_persister( | 155 void set_transport_security_persister( |
155 scoped_ptr<TransportSecurityPersister> transport_security_persister) { | 156 scoped_ptr<TransportSecurityPersister> transport_security_persister) { |
156 transport_security_persister = transport_security_persister.Pass(); | 157 transport_security_persister = transport_security_persister.Pass(); |
157 } | 158 } |
158 | 159 |
| 160 // Sets a HttpServerPropertiesManager. Note that the manager must be |
| 161 // initialized prior to this call. |
| 162 void set_http_server_properties_manager( |
| 163 scoped_ptr<HttpServerPropertiesManager> http_server_properties_manager) { |
| 164 http_server_properties_manager_ = http_server_properties_manager.Pass(); |
| 165 set_http_server_properties(http_server_properties_manager_->GetWeakPtr()); |
| 166 } |
| 167 |
159 protected: | 168 protected: |
160 ~BasicURLRequestContext() override { AssertNoURLRequests(); } | 169 ~BasicURLRequestContext() override { |
| 170 AssertNoURLRequests(); |
| 171 // Shut down the |http_server_properties_manager_| if there is one, since |
| 172 // this is the only place in BasicURLRequestContext to do so. |
| 173 // Note that the shutdown is performed on the network thread. |
| 174 if (http_server_properties_manager_) |
| 175 http_server_properties_manager_->ShutdownOnPrefThread(); |
| 176 } |
161 | 177 |
162 private: | 178 private: |
163 // The thread should be torn down last. | 179 // The thread should be torn down last. |
164 scoped_ptr<base::Thread> file_thread_; | 180 scoped_ptr<base::Thread> file_thread_; |
165 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_; | 181 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_; |
166 | 182 |
167 URLRequestContextStorage storage_; | 183 URLRequestContextStorage storage_; |
168 scoped_ptr<TransportSecurityPersister> transport_security_persister_; | 184 scoped_ptr<TransportSecurityPersister> transport_security_persister_; |
| 185 scoped_ptr<HttpServerPropertiesManager> http_server_properties_manager_; |
169 | 186 |
170 DISALLOW_COPY_AND_ASSIGN(BasicURLRequestContext); | 187 DISALLOW_COPY_AND_ASSIGN(BasicURLRequestContext); |
171 }; | 188 }; |
172 | 189 |
173 } // namespace | 190 } // namespace |
174 | 191 |
175 URLRequestContextBuilder::HttpCacheParams::HttpCacheParams() | 192 URLRequestContextBuilder::HttpCacheParams::HttpCacheParams() |
176 : type(IN_MEMORY), | 193 : type(IN_MEMORY), |
177 max_size(0) {} | 194 max_size(0) {} |
178 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {} | 195 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {} |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 DCHECK(cookie_store); | 259 DCHECK(cookie_store); |
243 cookie_store_ = cookie_store; | 260 cookie_store_ = cookie_store; |
244 channel_id_service_ = channel_id_service.Pass(); | 261 channel_id_service_ = channel_id_service.Pass(); |
245 } | 262 } |
246 | 263 |
247 void URLRequestContextBuilder::SetFileTaskRunner( | 264 void URLRequestContextBuilder::SetFileTaskRunner( |
248 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { | 265 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { |
249 file_task_runner_ = task_runner; | 266 file_task_runner_ = task_runner; |
250 } | 267 } |
251 | 268 |
| 269 void URLRequestContextBuilder::SetHttpServerPropertiesManager( |
| 270 scoped_ptr<HttpServerPropertiesManager> http_server_properties_manager) { |
| 271 http_server_properties_manager_ = http_server_properties_manager.Pass(); |
| 272 } |
| 273 |
252 URLRequestContext* URLRequestContextBuilder::Build() { | 274 URLRequestContext* URLRequestContextBuilder::Build() { |
253 BasicURLRequestContext* context = | 275 BasicURLRequestContext* context = |
254 new BasicURLRequestContext(file_task_runner_); | 276 new BasicURLRequestContext(file_task_runner_); |
255 URLRequestContextStorage* storage = context->storage(); | 277 URLRequestContextStorage* storage = context->storage(); |
256 | 278 |
257 storage->set_http_user_agent_settings(new StaticHttpUserAgentSettings( | 279 storage->set_http_user_agent_settings(new StaticHttpUserAgentSettings( |
258 accept_language_, user_agent_)); | 280 accept_language_, user_agent_)); |
259 | 281 |
260 if (!network_delegate_) | 282 if (!network_delegate_) |
261 network_delegate_.reset(new BasicNetworkDelegate); | 283 network_delegate_.reset(new BasicNetworkDelegate); |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 storage->set_transport_security_state(new TransportSecurityState()); | 347 storage->set_transport_security_state(new TransportSecurityState()); |
326 if (!transport_security_persister_path_.empty()) { | 348 if (!transport_security_persister_path_.empty()) { |
327 context->set_transport_security_persister( | 349 context->set_transport_security_persister( |
328 make_scoped_ptr<TransportSecurityPersister>( | 350 make_scoped_ptr<TransportSecurityPersister>( |
329 new TransportSecurityPersister(context->transport_security_state(), | 351 new TransportSecurityPersister(context->transport_security_state(), |
330 transport_security_persister_path_, | 352 transport_security_persister_path_, |
331 context->GetFileTaskRunner(), | 353 context->GetFileTaskRunner(), |
332 false))); | 354 false))); |
333 } | 355 } |
334 | 356 |
335 storage->set_http_server_properties( | 357 if (http_server_properties_manager_) { |
336 scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl())); | 358 context->set_http_server_properties_manager( |
| 359 http_server_properties_manager_.Pass()); |
| 360 } else { |
| 361 storage->set_http_server_properties( |
| 362 scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl())); |
| 363 } |
| 364 |
337 storage->set_cert_verifier(CertVerifier::CreateDefault()); | 365 storage->set_cert_verifier(CertVerifier::CreateDefault()); |
338 | 366 |
339 if (throttling_enabled_) | 367 if (throttling_enabled_) |
340 storage->set_throttler_manager(new URLRequestThrottlerManager()); | 368 storage->set_throttler_manager(new URLRequestThrottlerManager()); |
341 | 369 |
342 HttpNetworkSession::Params network_session_params; | 370 HttpNetworkSession::Params network_session_params; |
343 network_session_params.host_resolver = context->host_resolver(); | 371 network_session_params.host_resolver = context->host_resolver(); |
344 network_session_params.cert_verifier = context->cert_verifier(); | 372 network_session_params.cert_verifier = context->cert_verifier(); |
345 network_session_params.transport_security_state = | 373 network_session_params.transport_security_state = |
346 context->transport_security_state(); | 374 context->transport_security_state(); |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
427 } | 455 } |
428 url_request_interceptors_.weak_clear(); | 456 url_request_interceptors_.weak_clear(); |
429 } | 457 } |
430 storage->set_job_factory(top_job_factory.release()); | 458 storage->set_job_factory(top_job_factory.release()); |
431 // TODO(willchan): Support sdch. | 459 // TODO(willchan): Support sdch. |
432 | 460 |
433 return context; | 461 return context; |
434 } | 462 } |
435 | 463 |
436 } // namespace net | 464 } // namespace net |
OLD | NEW |