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/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" |
(...skipping 16 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" | |
38 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" | 37 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" |
39 #include "chrome/common/chrome_notification_types.h" | 38 #include "chrome/common/chrome_notification_types.h" |
40 #include "chrome/common/chrome_switches.h" | 39 #include "chrome/common/chrome_switches.h" |
41 #include "chrome/common/pref_names.h" | 40 #include "chrome/common/pref_names.h" |
42 #include "chrome/common/url_constants.h" | 41 #include "chrome/common/url_constants.h" |
43 #include "content/browser/appcache/chrome_appcache_service.h" | 42 #include "content/browser/appcache/chrome_appcache_service.h" |
44 #include "content/browser/chrome_blob_storage_context.h" | 43 #include "content/browser/chrome_blob_storage_context.h" |
45 #include "content/browser/download/download_id_factory.h" | 44 #include "content/browser/download/download_id_factory.h" |
46 #include "content/browser/host_zoom_map.h" | 45 #include "content/browser/host_zoom_map.h" |
47 #include "content/browser/renderer_host/media/media_stream_manager.h" | 46 #include "content/browser/renderer_host/media/media_stream_manager.h" |
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
438 | 437 |
439 proxy_service_.reset( | 438 proxy_service_.reset( |
440 ProxyServiceFactory::CreateProxyService( | 439 ProxyServiceFactory::CreateProxyService( |
441 io_thread->net_log(), | 440 io_thread->net_log(), |
442 io_thread_globals->proxy_script_fetcher_context.get(), | 441 io_thread_globals->proxy_script_fetcher_context.get(), |
443 profile_params_->proxy_config_service.release(), | 442 profile_params_->proxy_config_service.release(), |
444 command_line)); | 443 command_line)); |
445 | 444 |
446 transport_security_state_.reset(new net::TransportSecurityState( | 445 transport_security_state_.reset(new net::TransportSecurityState( |
447 command_line.GetSwitchValueASCII(switches::kHstsHosts))); | 446 command_line.GetSwitchValueASCII(switches::kHstsHosts))); |
448 transport_security_persister_.reset( | |
449 new TransportSecurityPersister(transport_security_state_.get(), | |
450 profile_params_->path, | |
451 profile_params_->is_incognito)); | |
452 | 447 |
453 // NOTE(willchan): Keep these protocol handlers in sync with | 448 // NOTE(willchan): Keep these protocol handlers in sync with |
454 // ProfileIOData::IsHandledProtocol(). | 449 // ProfileIOData::IsHandledProtocol(). |
455 job_factory_.reset(new net::URLRequestJobFactory); | 450 job_factory_.reset(new net::URLRequestJobFactory); |
456 if (profile_params_->protocol_handler_registry) { | 451 if (profile_params_->protocol_handler_registry) { |
457 job_factory_->AddInterceptor( | 452 job_factory_->AddInterceptor( |
458 new ProtocolHandlerRegistryInterceptor( | 453 new ProtocolHandlerRegistryInterceptor( |
459 profile_params_->protocol_handler_registry)); | 454 profile_params_->protocol_handler_registry)); |
460 } | 455 } |
461 bool set_protocol = job_factory_->SetProtocolHandler( | 456 bool set_protocol = job_factory_->SetProtocolHandler( |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
556 &resource_context_)); | 551 &resource_context_)); |
557 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); | 552 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); |
558 if (!posted) | 553 if (!posted) |
559 delete this; | 554 delete this; |
560 } | 555 } |
561 | 556 |
562 void ProfileIOData::set_origin_bound_cert_service( | 557 void ProfileIOData::set_origin_bound_cert_service( |
563 net::OriginBoundCertService* origin_bound_cert_service) const { | 558 net::OriginBoundCertService* origin_bound_cert_service) const { |
564 origin_bound_cert_service_.reset(origin_bound_cert_service); | 559 origin_bound_cert_service_.reset(origin_bound_cert_service); |
565 } | 560 } |
OLD | NEW |