OLD | NEW |
1 // Copyright (c) 2012 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/browser/profiles/profile_impl_io_data.h" | 5 #include "chrome/browser/profiles/profile_impl_io_data.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
12 #include "chrome/browser/io_thread.h" | 12 #include "chrome/browser/io_thread.h" |
13 #include "chrome/browser/net/chrome_net_log.h" | 13 #include "chrome/browser/net/chrome_net_log.h" |
14 #include "chrome/browser/net/chrome_network_delegate.h" | 14 #include "chrome/browser/net/chrome_network_delegate.h" |
15 #include "chrome/browser/net/connect_interceptor.h" | 15 #include "chrome/browser/net/connect_interceptor.h" |
16 #include "chrome/browser/net/http_server_properties_manager.h" | 16 #include "chrome/browser/net/http_server_properties_manager.h" |
17 #include "chrome/browser/net/predictor.h" | 17 #include "chrome/browser/net/predictor.h" |
18 #include "chrome/browser/net/sqlite_origin_bound_cert_store.h" | 18 #include "chrome/browser/net/sqlite_origin_bound_cert_store.h" |
19 #include "chrome/browser/net/sqlite_persistent_cookie_store.h" | 19 #include "chrome/browser/net/sqlite_persistent_cookie_store.h" |
20 #include "chrome/browser/prefs/pref_member.h" | 20 #include "chrome/browser/prefs/pref_member.h" |
21 #include "chrome/browser/profiles/profile.h" | 21 #include "chrome/browser/profiles/profile.h" |
22 #include "chrome/browser/transport_security_persister.h" | |
23 #include "chrome/common/chrome_constants.h" | 22 #include "chrome/common/chrome_constants.h" |
24 #include "chrome/common/chrome_switches.h" | 23 #include "chrome/common/chrome_switches.h" |
25 #include "chrome/common/pref_names.h" | 24 #include "chrome/common/pref_names.h" |
26 #include "chrome/common/url_constants.h" | 25 #include "chrome/common/url_constants.h" |
27 #include "content/browser/resource_context.h" | 26 #include "content/browser/resource_context.h" |
28 #include "content/public/browser/browser_thread.h" | 27 #include "content/public/browser/browser_thread.h" |
29 #include "net/base/origin_bound_cert_service.h" | 28 #include "net/base/origin_bound_cert_service.h" |
30 #include "net/ftp/ftp_network_layer.h" | 29 #include "net/ftp/ftp_network_layer.h" |
31 #include "net/http/http_cache.h" | 30 #include "net/http/http_cache.h" |
32 #include "net/url_request/url_request_job_factory.h" | 31 #include "net/url_request/url_request_job_factory.h" |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 | 269 |
271 // Initialize context members. | 270 // Initialize context members. |
272 | 271 |
273 ApplyProfileParamsToContext(main_context); | 272 ApplyProfileParamsToContext(main_context); |
274 ApplyProfileParamsToContext(media_request_context_); | 273 ApplyProfileParamsToContext(media_request_context_); |
275 ApplyProfileParamsToContext(extensions_context); | 274 ApplyProfileParamsToContext(extensions_context); |
276 | 275 |
277 if (http_server_properties_manager_.get()) | 276 if (http_server_properties_manager_.get()) |
278 http_server_properties_manager_->InitializeOnIOThread(); | 277 http_server_properties_manager_->InitializeOnIOThread(); |
279 | 278 |
280 transport_security_persister_.reset( | |
281 new TransportSecurityPersister(transport_security_state(), | |
282 profile_params->path, | |
283 profile_params->is_incognito)); | |
284 | |
285 main_context->set_transport_security_state(transport_security_state()); | 279 main_context->set_transport_security_state(transport_security_state()); |
286 media_request_context_->set_transport_security_state( | 280 media_request_context_->set_transport_security_state( |
287 transport_security_state()); | 281 transport_security_state()); |
288 extensions_context->set_transport_security_state(transport_security_state()); | 282 extensions_context->set_transport_security_state(transport_security_state()); |
289 | 283 |
290 main_context->set_net_log(io_thread->net_log()); | 284 main_context->set_net_log(io_thread->net_log()); |
291 media_request_context_->set_net_log(io_thread->net_log()); | 285 media_request_context_->set_net_log(io_thread->net_log()); |
292 extensions_context->set_net_log(io_thread->net_log()); | 286 extensions_context->set_net_log(io_thread->net_log()); |
293 | 287 |
294 main_context->set_network_delegate(network_delegate()); | 288 main_context->set_network_delegate(network_delegate()); |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
509 scoped_refptr<ChromeURLRequestContext> | 503 scoped_refptr<ChromeURLRequestContext> |
510 ProfileImplIOData::AcquireIsolatedAppRequestContext( | 504 ProfileImplIOData::AcquireIsolatedAppRequestContext( |
511 scoped_refptr<ChromeURLRequestContext> main_context, | 505 scoped_refptr<ChromeURLRequestContext> main_context, |
512 const std::string& app_id) const { | 506 const std::string& app_id) const { |
513 // We create per-app contexts on demand, unlike the others above. | 507 // We create per-app contexts on demand, unlike the others above. |
514 scoped_refptr<ChromeURLRequestContext> app_request_context = | 508 scoped_refptr<ChromeURLRequestContext> app_request_context = |
515 InitializeAppRequestContext(main_context, app_id); | 509 InitializeAppRequestContext(main_context, app_id); |
516 DCHECK(app_request_context); | 510 DCHECK(app_request_context); |
517 return app_request_context; | 511 return app_request_context; |
518 } | 512 } |
OLD | NEW |