| 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_impl_io_data.h" | 5 #include "chrome/browser/profiles/profile_impl_io_data.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 474 ApplyProfileParamsToContext(main_context); | 474 ApplyProfileParamsToContext(main_context); |
| 475 | 475 |
| 476 if (lazy_params_->http_server_properties_manager) { | 476 if (lazy_params_->http_server_properties_manager) { |
| 477 lazy_params_->http_server_properties_manager->InitializeOnNetworkThread(); | 477 lazy_params_->http_server_properties_manager->InitializeOnNetworkThread(); |
| 478 main_context_storage->set_http_server_properties( | 478 main_context_storage->set_http_server_properties( |
| 479 std::move(lazy_params_->http_server_properties_manager)); | 479 std::move(lazy_params_->http_server_properties_manager)); |
| 480 } | 480 } |
| 481 | 481 |
| 482 main_context->set_transport_security_state(transport_security_state()); | 482 main_context->set_transport_security_state(transport_security_state()); |
| 483 main_context->set_ct_policy_enforcer( | 483 main_context->set_ct_policy_enforcer( |
| 484 io_thread_globals->ct_policy_enforcer.get()); | 484 io_thread_globals->system_request_context->ct_policy_enforcer()); |
| 485 | 485 |
| 486 main_context->set_net_log(io_thread->net_log()); | 486 main_context->set_net_log(io_thread->net_log()); |
| 487 | 487 |
| 488 main_context->set_http_auth_handler_factory( | 488 main_context->set_http_auth_handler_factory( |
| 489 io_thread_globals->http_auth_handler_factory.get()); | 489 io_thread_globals->http_auth_handler_factory.get()); |
| 490 | 490 |
| 491 main_context->set_proxy_service(proxy_service()); | 491 main_context->set_proxy_service(proxy_service()); |
| 492 | 492 |
| 493 // Set up cookie store. | 493 // Set up cookie store. |
| 494 DCHECK(!lazy_params_->cookie_path.empty()); | 494 DCHECK(!lazy_params_->cookie_path.empty()); |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 567 | 567 |
| 568 void ProfileImplIOData:: | 568 void ProfileImplIOData:: |
| 569 InitializeExtensionsRequestContext(ProfileParams* profile_params) const { | 569 InitializeExtensionsRequestContext(ProfileParams* profile_params) const { |
| 570 net::URLRequestContext* extensions_context = extensions_request_context(); | 570 net::URLRequestContext* extensions_context = extensions_request_context(); |
| 571 IOThread* const io_thread = profile_params->io_thread; | 571 IOThread* const io_thread = profile_params->io_thread; |
| 572 IOThread::Globals* const io_thread_globals = io_thread->globals(); | 572 IOThread::Globals* const io_thread_globals = io_thread->globals(); |
| 573 ApplyProfileParamsToContext(extensions_context); | 573 ApplyProfileParamsToContext(extensions_context); |
| 574 | 574 |
| 575 extensions_context->set_transport_security_state(transport_security_state()); | 575 extensions_context->set_transport_security_state(transport_security_state()); |
| 576 extensions_context->set_ct_policy_enforcer( | 576 extensions_context->set_ct_policy_enforcer( |
| 577 io_thread_globals->ct_policy_enforcer.get()); | 577 io_thread_globals->system_request_context->ct_policy_enforcer()); |
| 578 | 578 |
| 579 extensions_context->set_net_log(io_thread->net_log()); | 579 extensions_context->set_net_log(io_thread->net_log()); |
| 580 | 580 |
| 581 content::CookieStoreConfig cookie_config( | 581 content::CookieStoreConfig cookie_config( |
| 582 lazy_params_->extensions_cookie_path, | 582 lazy_params_->extensions_cookie_path, |
| 583 lazy_params_->session_cookie_mode, | 583 lazy_params_->session_cookie_mode, |
| 584 NULL, NULL); | 584 NULL, NULL); |
| 585 cookie_config.crypto_delegate = cookie_config::GetCookieCryptoDelegate(); | 585 cookie_config.crypto_delegate = cookie_config::GetCookieCryptoDelegate(); |
| 586 // Enable cookies for chrome-extension URLs. | 586 // Enable cookies for chrome-extension URLs. |
| 587 cookie_config.cookieable_schemes.push_back(extensions::kExtensionScheme); | 587 cookie_config.cookieable_schemes.push_back(extensions::kExtensionScheme); |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 806 const base::Closure& completion) { | 806 const base::Closure& completion) { |
| 807 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 807 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 808 DCHECK(initialized()); | 808 DCHECK(initialized()); |
| 809 | 809 |
| 810 DCHECK(transport_security_state()); | 810 DCHECK(transport_security_state()); |
| 811 // Completes synchronously. | 811 // Completes synchronously. |
| 812 transport_security_state()->DeleteAllDynamicDataSince(time); | 812 transport_security_state()->DeleteAllDynamicDataSince(time); |
| 813 DCHECK(http_server_properties_manager_); | 813 DCHECK(http_server_properties_manager_); |
| 814 http_server_properties_manager_->Clear(completion); | 814 http_server_properties_manager_->Clear(completion); |
| 815 } | 815 } |
| OLD | NEW |