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_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
(...skipping 15 matching lines...) Expand all Loading... |
27 #include "chrome/browser/net/chrome_cookie_notification_details.h" | 27 #include "chrome/browser/net/chrome_cookie_notification_details.h" |
28 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h" | 28 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h" |
29 #include "chrome/browser/net/chrome_net_log.h" | 29 #include "chrome/browser/net/chrome_net_log.h" |
30 #include "chrome/browser/net/chrome_network_delegate.h" | 30 #include "chrome/browser/net/chrome_network_delegate.h" |
31 #include "chrome/browser/net/proxy_service_factory.h" | 31 #include "chrome/browser/net/proxy_service_factory.h" |
32 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 32 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
33 #include "chrome/browser/policy/url_blacklist_manager.h" | 33 #include "chrome/browser/policy/url_blacklist_manager.h" |
34 #include "chrome/browser/prefs/pref_service.h" | 34 #include "chrome/browser/prefs/pref_service.h" |
35 #include "chrome/browser/profiles/profile.h" | 35 #include "chrome/browser/profiles/profile.h" |
36 #include "chrome/browser/profiles/profile_manager.h" | 36 #include "chrome/browser/profiles/profile_manager.h" |
| 37 #include "chrome/browser/transport_security_persister.h" |
37 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" | 38 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" |
38 #include "chrome/common/chrome_notification_types.h" | 39 #include "chrome/common/chrome_notification_types.h" |
39 #include "chrome/common/chrome_switches.h" | 40 #include "chrome/common/chrome_switches.h" |
40 #include "chrome/common/pref_names.h" | 41 #include "chrome/common/pref_names.h" |
41 #include "chrome/common/url_constants.h" | 42 #include "chrome/common/url_constants.h" |
42 #include "content/browser/appcache/chrome_appcache_service.h" | 43 #include "content/browser/appcache/chrome_appcache_service.h" |
43 #include "content/browser/chrome_blob_storage_context.h" | 44 #include "content/browser/chrome_blob_storage_context.h" |
44 #include "content/browser/renderer_host/media/media_stream_manager.h" | 45 #include "content/browser/renderer_host/media/media_stream_manager.h" |
45 #include "content/browser/renderer_host/resource_dispatcher_host.h" | 46 #include "content/browser/renderer_host/resource_dispatcher_host.h" |
46 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" | 47 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" |
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
433 | 434 |
434 proxy_service_.reset( | 435 proxy_service_.reset( |
435 ProxyServiceFactory::CreateProxyService( | 436 ProxyServiceFactory::CreateProxyService( |
436 io_thread->net_log(), | 437 io_thread->net_log(), |
437 io_thread_globals->proxy_script_fetcher_context.get(), | 438 io_thread_globals->proxy_script_fetcher_context.get(), |
438 profile_params_->proxy_config_service.release(), | 439 profile_params_->proxy_config_service.release(), |
439 command_line)); | 440 command_line)); |
440 | 441 |
441 transport_security_state_.reset(new net::TransportSecurityState( | 442 transport_security_state_.reset(new net::TransportSecurityState( |
442 command_line.GetSwitchValueASCII(switches::kHstsHosts))); | 443 command_line.GetSwitchValueASCII(switches::kHstsHosts))); |
| 444 transport_security_persister_.reset( |
| 445 new TransportSecurityPersister(transport_security_state_.get(), |
| 446 profile_params_->path, |
| 447 profile_params_->is_incognito)); |
443 | 448 |
444 // NOTE(willchan): Keep these protocol handlers in sync with | 449 // NOTE(willchan): Keep these protocol handlers in sync with |
445 // ProfileIOData::IsHandledProtocol(). | 450 // ProfileIOData::IsHandledProtocol(). |
446 job_factory_.reset(new net::URLRequestJobFactory); | 451 job_factory_.reset(new net::URLRequestJobFactory); |
447 if (profile_params_->protocol_handler_registry) { | 452 if (profile_params_->protocol_handler_registry) { |
448 job_factory_->AddInterceptor( | 453 job_factory_->AddInterceptor( |
449 new ProtocolHandlerRegistryInterceptor( | 454 new ProtocolHandlerRegistryInterceptor( |
450 profile_params_->protocol_handler_registry)); | 455 profile_params_->protocol_handler_registry)); |
451 } | 456 } |
452 bool set_protocol = job_factory_->SetProtocolHandler( | 457 bool set_protocol = job_factory_->SetProtocolHandler( |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
546 &resource_context_)); | 551 &resource_context_)); |
547 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); | 552 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); |
548 if (!posted) | 553 if (!posted) |
549 delete this; | 554 delete this; |
550 } | 555 } |
551 | 556 |
552 void ProfileIOData::set_origin_bound_cert_service( | 557 void ProfileIOData::set_origin_bound_cert_service( |
553 net::OriginBoundCertService* origin_bound_cert_service) const { | 558 net::OriginBoundCertService* origin_bound_cert_service) const { |
554 origin_bound_cert_service_.reset(origin_bound_cert_service); | 559 origin_bound_cert_service_.reset(origin_bound_cert_service); |
555 } | 560 } |
OLD | NEW |