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 <stddef.h> | 7 #include <stddef.h> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 27 matching lines...) Expand all Loading... |
38 #include "chrome/browser/media/media_device_id_salt.h" | 38 #include "chrome/browser/media/media_device_id_salt.h" |
39 #include "chrome/browser/net/chrome_http_user_agent_settings.h" | 39 #include "chrome/browser/net/chrome_http_user_agent_settings.h" |
40 #include "chrome/browser/net/chrome_network_delegate.h" | 40 #include "chrome/browser/net/chrome_network_delegate.h" |
41 #include "chrome/browser/net/chrome_url_request_context_getter.h" | 41 #include "chrome/browser/net/chrome_url_request_context_getter.h" |
42 #include "chrome/browser/net/proxy_service_factory.h" | 42 #include "chrome/browser/net/proxy_service_factory.h" |
43 #include "chrome/browser/net/resource_prefetch_predictor_observer.h" | 43 #include "chrome/browser/net/resource_prefetch_predictor_observer.h" |
44 #include "chrome/browser/predictors/resource_prefetch_predictor.h" | 44 #include "chrome/browser/predictors/resource_prefetch_predictor.h" |
45 #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h" | 45 #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h" |
46 #include "chrome/browser/profiles/profile.h" | 46 #include "chrome/browser/profiles/profile.h" |
47 #include "chrome/browser/profiles/profile_manager.h" | 47 #include "chrome/browser/profiles/profile_manager.h" |
| 48 #include "chrome/browser/ssl/chrome_expect_ct_reporter.h" |
48 #include "chrome/browser/ui/search/new_tab_page_interceptor_service.h" | 49 #include "chrome/browser/ui/search/new_tab_page_interceptor_service.h" |
49 #include "chrome/browser/ui/search/new_tab_page_interceptor_service_factory.h" | 50 #include "chrome/browser/ui/search/new_tab_page_interceptor_service_factory.h" |
50 #include "chrome/common/chrome_paths.h" | 51 #include "chrome/common/chrome_paths.h" |
51 #include "chrome/common/chrome_switches.h" | 52 #include "chrome/common/chrome_switches.h" |
52 #include "chrome/common/features.h" | 53 #include "chrome/common/features.h" |
53 #include "chrome/common/pref_names.h" | 54 #include "chrome/common/pref_names.h" |
54 #include "chrome/common/url_constants.h" | 55 #include "chrome/common/url_constants.h" |
55 #include "components/about_handler/about_protocol_handler.h" | 56 #include "components/about_handler/about_protocol_handler.h" |
56 #include "components/content_settings/core/browser/content_settings_provider.h" | 57 #include "components/content_settings/core/browser/content_settings_provider.h" |
57 #include "components/content_settings/core/browser/cookie_settings.h" | 58 #include "components/content_settings/core/browser/cookie_settings.h" |
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
659 memcpy(&media_context_vtable_cache[current_context], | 660 memcpy(&media_context_vtable_cache[current_context], |
660 static_cast<void*>(it->second), sizeof(void*)); | 661 static_cast<void*>(it->second), sizeof(void*)); |
661 } | 662 } |
662 | 663 |
663 // Destroy certificate_report_sender_ before main_request_context_, | 664 // Destroy certificate_report_sender_ before main_request_context_, |
664 // since the former has a reference to the latter. | 665 // since the former has a reference to the latter. |
665 if (transport_security_state_) | 666 if (transport_security_state_) |
666 transport_security_state_->SetReportSender(nullptr); | 667 transport_security_state_->SetReportSender(nullptr); |
667 certificate_report_sender_.reset(); | 668 certificate_report_sender_.reset(); |
668 | 669 |
| 670 if (transport_security_state_) |
| 671 transport_security_state_->SetExpectCTReporter(nullptr); |
| 672 expect_ct_reporter_.reset(); |
| 673 |
669 // TODO(ajwong): These AssertNoURLRequests() calls are unnecessary since they | 674 // TODO(ajwong): These AssertNoURLRequests() calls are unnecessary since they |
670 // are already done in the URLRequestContext destructor. | 675 // are already done in the URLRequestContext destructor. |
671 if (main_request_context_) | 676 if (main_request_context_) |
672 main_request_context_->AssertNoURLRequests(); | 677 main_request_context_->AssertNoURLRequests(); |
673 if (extensions_request_context_) | 678 if (extensions_request_context_) |
674 extensions_request_context_->AssertNoURLRequests(); | 679 extensions_request_context_->AssertNoURLRequests(); |
675 | 680 |
676 current_context = 0; | 681 current_context = 0; |
677 for (URLRequestContextMap::iterator it = app_request_context_map_.begin(); | 682 for (URLRequestContextMap::iterator it = app_request_context_map_.begin(); |
678 it != app_request_context_map_.end(); ++it) { | 683 it != app_request_context_map_.end(); ++it) { |
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1065 pool->GetSequencedTaskRunnerWithShutdownBehavior( | 1070 pool->GetSequencedTaskRunnerWithShutdownBehavior( |
1066 pool->GetSequenceToken(), | 1071 pool->GetSequenceToken(), |
1067 base::SequencedWorkerPool::BLOCK_SHUTDOWN), | 1072 base::SequencedWorkerPool::BLOCK_SHUTDOWN), |
1068 IsOffTheRecord())); | 1073 IsOffTheRecord())); |
1069 | 1074 |
1070 certificate_report_sender_.reset(new net::CertificateReportSender( | 1075 certificate_report_sender_.reset(new net::CertificateReportSender( |
1071 main_request_context_.get(), | 1076 main_request_context_.get(), |
1072 net::CertificateReportSender::DO_NOT_SEND_COOKIES)); | 1077 net::CertificateReportSender::DO_NOT_SEND_COOKIES)); |
1073 transport_security_state_->SetReportSender(certificate_report_sender_.get()); | 1078 transport_security_state_->SetReportSender(certificate_report_sender_.get()); |
1074 | 1079 |
| 1080 expect_ct_reporter_.reset( |
| 1081 new ChromeExpectCTReporter(main_request_context_.get())); |
| 1082 transport_security_state_->SetExpectCTReporter(expect_ct_reporter_.get()); |
| 1083 |
1075 // Take ownership over these parameters. | 1084 // Take ownership over these parameters. |
1076 cookie_settings_ = profile_params_->cookie_settings; | 1085 cookie_settings_ = profile_params_->cookie_settings; |
1077 host_content_settings_map_ = profile_params_->host_content_settings_map; | 1086 host_content_settings_map_ = profile_params_->host_content_settings_map; |
1078 #if defined(ENABLE_EXTENSIONS) | 1087 #if defined(ENABLE_EXTENSIONS) |
1079 extension_info_map_ = profile_params_->extension_info_map; | 1088 extension_info_map_ = profile_params_->extension_info_map; |
1080 #endif | 1089 #endif |
1081 | 1090 |
1082 resource_context_->host_resolver_ = io_thread_globals->host_resolver.get(); | 1091 resource_context_->host_resolver_ = io_thread_globals->host_resolver.get(); |
1083 resource_context_->request_context_ = main_request_context_.get(); | 1092 resource_context_->request_context_ = main_request_context_.get(); |
1084 | 1093 |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1322 make_scoped_ptr(new DevToolsNetworkTransactionFactory( | 1331 make_scoped_ptr(new DevToolsNetworkTransactionFactory( |
1323 network_controller_handle_.GetController(), shared_session)), | 1332 network_controller_handle_.GetController(), shared_session)), |
1324 std::move(backend), true /* set_up_quic_server_info */)); | 1333 std::move(backend), true /* set_up_quic_server_info */)); |
1325 } | 1334 } |
1326 | 1335 |
1327 void ProfileIOData::SetCookieSettingsForTesting( | 1336 void ProfileIOData::SetCookieSettingsForTesting( |
1328 content_settings::CookieSettings* cookie_settings) { | 1337 content_settings::CookieSettings* cookie_settings) { |
1329 DCHECK(!cookie_settings_.get()); | 1338 DCHECK(!cookie_settings_.get()); |
1330 cookie_settings_ = cookie_settings; | 1339 cookie_settings_ = cookie_settings; |
1331 } | 1340 } |
OLD | NEW |