| 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 28 matching lines...) Expand all Loading... |
| 39 #include "chrome/browser/media/media_device_id_salt.h" | 39 #include "chrome/browser/media/media_device_id_salt.h" |
| 40 #include "chrome/browser/net/chrome_http_user_agent_settings.h" | 40 #include "chrome/browser/net/chrome_http_user_agent_settings.h" |
| 41 #include "chrome/browser/net/chrome_network_delegate.h" | 41 #include "chrome/browser/net/chrome_network_delegate.h" |
| 42 #include "chrome/browser/net/chrome_url_request_context_getter.h" | 42 #include "chrome/browser/net/chrome_url_request_context_getter.h" |
| 43 #include "chrome/browser/net/proxy_service_factory.h" | 43 #include "chrome/browser/net/proxy_service_factory.h" |
| 44 #include "chrome/browser/net/resource_prefetch_predictor_observer.h" | 44 #include "chrome/browser/net/resource_prefetch_predictor_observer.h" |
| 45 #include "chrome/browser/predictors/resource_prefetch_predictor.h" | 45 #include "chrome/browser/predictors/resource_prefetch_predictor.h" |
| 46 #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h" | 46 #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h" |
| 47 #include "chrome/browser/profiles/profile.h" | 47 #include "chrome/browser/profiles/profile.h" |
| 48 #include "chrome/browser/profiles/profile_manager.h" | 48 #include "chrome/browser/profiles/profile_manager.h" |
| 49 #include "chrome/browser/ssl/expect_ct_reporter.h" |
| 49 #include "chrome/browser/ui/search/new_tab_page_interceptor_service.h" | 50 #include "chrome/browser/ui/search/new_tab_page_interceptor_service.h" |
| 50 #include "chrome/browser/ui/search/new_tab_page_interceptor_service_factory.h" | 51 #include "chrome/browser/ui/search/new_tab_page_interceptor_service_factory.h" |
| 51 #include "chrome/common/chrome_paths.h" | 52 #include "chrome/common/chrome_paths.h" |
| 52 #include "chrome/common/chrome_switches.h" | 53 #include "chrome/common/chrome_switches.h" |
| 53 #include "chrome/common/features.h" | 54 #include "chrome/common/features.h" |
| 54 #include "chrome/common/pref_names.h" | 55 #include "chrome/common/pref_names.h" |
| 55 #include "chrome/common/url_constants.h" | 56 #include "chrome/common/url_constants.h" |
| 56 #include "components/about_handler/about_protocol_handler.h" | 57 #include "components/about_handler/about_protocol_handler.h" |
| 57 #include "components/content_settings/core/browser/content_settings_provider.h" | 58 #include "components/content_settings/core/browser/content_settings_provider.h" |
| 58 #include "components/content_settings/core/browser/cookie_settings.h" | 59 #include "components/content_settings/core/browser/cookie_settings.h" |
| (...skipping 1006 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1065 pool->GetSequencedTaskRunnerWithShutdownBehavior( | 1066 pool->GetSequencedTaskRunnerWithShutdownBehavior( |
| 1066 pool->GetSequenceToken(), | 1067 pool->GetSequenceToken(), |
| 1067 base::SequencedWorkerPool::BLOCK_SHUTDOWN), | 1068 base::SequencedWorkerPool::BLOCK_SHUTDOWN), |
| 1068 IsOffTheRecord())); | 1069 IsOffTheRecord())); |
| 1069 | 1070 |
| 1070 certificate_report_sender_.reset(new net::CertificateReportSender( | 1071 certificate_report_sender_.reset(new net::CertificateReportSender( |
| 1071 main_request_context_.get(), | 1072 main_request_context_.get(), |
| 1072 net::CertificateReportSender::DO_NOT_SEND_COOKIES)); | 1073 net::CertificateReportSender::DO_NOT_SEND_COOKIES)); |
| 1073 transport_security_state_->SetReportSender(certificate_report_sender_.get()); | 1074 transport_security_state_->SetReportSender(certificate_report_sender_.get()); |
| 1074 | 1075 |
| 1076 expect_ct_monitor_.reset(new ExpectCTReporter( |
| 1077 main_request_context_.get(), transport_security_state_.get())); |
| 1078 network_delegate->set_expect_ct_monitor(expect_ct_monitor_.get()); |
| 1079 |
| 1075 // Take ownership over these parameters. | 1080 // Take ownership over these parameters. |
| 1076 cookie_settings_ = profile_params_->cookie_settings; | 1081 cookie_settings_ = profile_params_->cookie_settings; |
| 1077 host_content_settings_map_ = profile_params_->host_content_settings_map; | 1082 host_content_settings_map_ = profile_params_->host_content_settings_map; |
| 1078 #if defined(ENABLE_EXTENSIONS) | 1083 #if defined(ENABLE_EXTENSIONS) |
| 1079 extension_info_map_ = profile_params_->extension_info_map; | 1084 extension_info_map_ = profile_params_->extension_info_map; |
| 1080 #endif | 1085 #endif |
| 1081 | 1086 |
| 1082 resource_context_->host_resolver_ = io_thread_globals->host_resolver.get(); | 1087 resource_context_->host_resolver_ = io_thread_globals->host_resolver.get(); |
| 1083 resource_context_->request_context_ = main_request_context_.get(); | 1088 resource_context_->request_context_ = main_request_context_.get(); |
| 1084 | 1089 |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1322 make_scoped_ptr(new DevToolsNetworkTransactionFactory( | 1327 make_scoped_ptr(new DevToolsNetworkTransactionFactory( |
| 1323 network_controller_handle_.GetController(), shared_session)), | 1328 network_controller_handle_.GetController(), shared_session)), |
| 1324 std::move(backend), true /* set_up_quic_server_info */)); | 1329 std::move(backend), true /* set_up_quic_server_info */)); |
| 1325 } | 1330 } |
| 1326 | 1331 |
| 1327 void ProfileIOData::SetCookieSettingsForTesting( | 1332 void ProfileIOData::SetCookieSettingsForTesting( |
| 1328 content_settings::CookieSettings* cookie_settings) { | 1333 content_settings::CookieSettings* cookie_settings) { |
| 1329 DCHECK(!cookie_settings_.get()); | 1334 DCHECK(!cookie_settings_.get()); |
| 1330 cookie_settings_ = cookie_settings; | 1335 cookie_settings_ = cookie_settings; |
| 1331 } | 1336 } |
| OLD | NEW |