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/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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d
ata.h" | 57 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d
ata.h" |
58 #include "components/dom_distiller/core/url_constants.h" | 58 #include "components/dom_distiller/core/url_constants.h" |
59 #include "components/sync_driver/pref_names.h" | 59 #include "components/sync_driver/pref_names.h" |
60 #include "components/url_fixer/url_fixer.h" | 60 #include "components/url_fixer/url_fixer.h" |
61 #include "content/public/browser/browser_thread.h" | 61 #include "content/public/browser/browser_thread.h" |
62 #include "content/public/browser/host_zoom_map.h" | 62 #include "content/public/browser/host_zoom_map.h" |
63 #include "content/public/browser/notification_service.h" | 63 #include "content/public/browser/notification_service.h" |
64 #include "content/public/browser/resource_context.h" | 64 #include "content/public/browser/resource_context.h" |
65 #include "net/base/keygen_handler.h" | 65 #include "net/base/keygen_handler.h" |
66 #include "net/cookies/canonical_cookie.h" | 66 #include "net/cookies/canonical_cookie.h" |
| 67 #include "net/http/certificate_report_sender_impl.h" |
67 #include "net/http/http_transaction_factory.h" | 68 #include "net/http/http_transaction_factory.h" |
68 #include "net/http/http_util.h" | 69 #include "net/http/http_util.h" |
69 #include "net/http/transport_security_persister.h" | 70 #include "net/http/transport_security_persister.h" |
| 71 #include "net/http/transport_security_reporter.h" |
70 #include "net/proxy/proxy_config_service_fixed.h" | 72 #include "net/proxy/proxy_config_service_fixed.h" |
71 #include "net/proxy/proxy_script_fetcher_impl.h" | 73 #include "net/proxy/proxy_script_fetcher_impl.h" |
72 #include "net/proxy/proxy_service.h" | 74 #include "net/proxy/proxy_service.h" |
73 #include "net/ssl/channel_id_service.h" | 75 #include "net/ssl/channel_id_service.h" |
74 #include "net/ssl/client_cert_store.h" | 76 #include "net/ssl/client_cert_store.h" |
75 #include "net/url_request/data_protocol_handler.h" | 77 #include "net/url_request/data_protocol_handler.h" |
76 #include "net/url_request/file_protocol_handler.h" | 78 #include "net/url_request/file_protocol_handler.h" |
77 #include "net/url_request/ftp_protocol_handler.h" | 79 #include "net/url_request/ftp_protocol_handler.h" |
78 #include "net/url_request/url_request.h" | 80 #include "net/url_request/url_request.h" |
79 #include "net/url_request/url_request_context.h" | 81 #include "net/url_request/url_request_context.h" |
(...skipping 970 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1050 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); | 1052 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); |
1051 transport_security_persister_.reset( | 1053 transport_security_persister_.reset( |
1052 new net::TransportSecurityPersister( | 1054 new net::TransportSecurityPersister( |
1053 transport_security_state_.get(), | 1055 transport_security_state_.get(), |
1054 profile_params_->path, | 1056 profile_params_->path, |
1055 pool->GetSequencedTaskRunnerWithShutdownBehavior( | 1057 pool->GetSequencedTaskRunnerWithShutdownBehavior( |
1056 pool->GetSequenceToken(), | 1058 pool->GetSequenceToken(), |
1057 base::SequencedWorkerPool::BLOCK_SHUTDOWN), | 1059 base::SequencedWorkerPool::BLOCK_SHUTDOWN), |
1058 IsOffTheRecord())); | 1060 IsOffTheRecord())); |
1059 | 1061 |
| 1062 // TODO(estark): introduce a ChromeTransportSecurityReporter class |
| 1063 // that covers the ChromeFraudulentCertificateReporter functionality, |
| 1064 // instantiate it here, and then remove FraudulentCertificateReporter |
| 1065 // and ChromeFraudulentCertificateReporter. |
| 1066 transport_security_reporter_.reset(new net::TransportSecurityReporter( |
| 1067 transport_security_state_.get(), |
| 1068 scoped_ptr<net::CertificateReportSender>( |
| 1069 new net::CertificateReportSenderImpl( |
| 1070 main_request_context_.get(), |
| 1071 net::CertificateReportSender::DO_NOT_SEND_COOKIES)))); |
| 1072 |
1060 // Take ownership over these parameters. | 1073 // Take ownership over these parameters. |
1061 cookie_settings_ = profile_params_->cookie_settings; | 1074 cookie_settings_ = profile_params_->cookie_settings; |
1062 host_content_settings_map_ = profile_params_->host_content_settings_map; | 1075 host_content_settings_map_ = profile_params_->host_content_settings_map; |
1063 #if defined(ENABLE_EXTENSIONS) | 1076 #if defined(ENABLE_EXTENSIONS) |
1064 extension_info_map_ = profile_params_->extension_info_map; | 1077 extension_info_map_ = profile_params_->extension_info_map; |
1065 #endif | 1078 #endif |
1066 | 1079 |
1067 resource_context_->host_resolver_ = io_thread_globals->host_resolver.get(); | 1080 resource_context_->host_resolver_ = io_thread_globals->host_resolver.get(); |
1068 resource_context_->request_context_ = main_request_context_.get(); | 1081 resource_context_->request_context_ = main_request_context_.get(); |
1069 | 1082 |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1295 new DevToolsNetworkTransactionFactory( | 1308 new DevToolsNetworkTransactionFactory( |
1296 network_controller_.get(), shared_session), | 1309 network_controller_.get(), shared_session), |
1297 shared_session->net_log(), backend)); | 1310 shared_session->net_log(), backend)); |
1298 } | 1311 } |
1299 | 1312 |
1300 void ProfileIOData::SetCookieSettingsForTesting( | 1313 void ProfileIOData::SetCookieSettingsForTesting( |
1301 CookieSettings* cookie_settings) { | 1314 CookieSettings* cookie_settings) { |
1302 DCHECK(!cookie_settings_.get()); | 1315 DCHECK(!cookie_settings_.get()); |
1303 cookie_settings_ = cookie_settings; | 1316 cookie_settings_ = cookie_settings; |
1304 } | 1317 } |
OLD | NEW |