Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Side by Side Diff: chrome/browser/profiles/profile_impl_io_data.cc

Issue 2872133005: IOThread: Move more stuff into system context's URLRequestContextStore. (Closed)
Patch Set: Fix merge Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 ApplyProfileParamsToContext(main_context); 472 ApplyProfileParamsToContext(main_context);
473 473
474 if (lazy_params_->http_server_properties_manager) { 474 if (lazy_params_->http_server_properties_manager) {
475 lazy_params_->http_server_properties_manager->InitializeOnNetworkThread(); 475 lazy_params_->http_server_properties_manager->InitializeOnNetworkThread();
476 main_context_storage->set_http_server_properties( 476 main_context_storage->set_http_server_properties(
477 std::move(lazy_params_->http_server_properties_manager)); 477 std::move(lazy_params_->http_server_properties_manager));
478 } 478 }
479 479
480 main_context->set_transport_security_state(transport_security_state()); 480 main_context->set_transport_security_state(transport_security_state());
481 main_context->set_ct_policy_enforcer( 481 main_context->set_ct_policy_enforcer(
482 io_thread_globals->ct_policy_enforcer.get()); 482 io_thread_globals->system_request_context->ct_policy_enforcer());
483 483
484 main_context->set_net_log(io_thread->net_log()); 484 main_context->set_net_log(io_thread->net_log());
485 485
486 main_context->set_http_auth_handler_factory( 486 main_context->set_http_auth_handler_factory(
487 io_thread_globals->http_auth_handler_factory.get()); 487 io_thread_globals->http_auth_handler_factory.get());
488 488
489 main_context->set_proxy_service(proxy_service()); 489 main_context->set_proxy_service(proxy_service());
490 490
491 // Create a single task runner to use with the CookieStore and ChannelIDStore. 491 // Create a single task runner to use with the CookieStore and ChannelIDStore.
492 scoped_refptr<base::SequencedTaskRunner> cookie_background_task_runner = 492 scoped_refptr<base::SequencedTaskRunner> cookie_background_task_runner =
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 const base::Closure& completion) { 791 const base::Closure& completion) {
792 DCHECK_CURRENTLY_ON(BrowserThread::IO); 792 DCHECK_CURRENTLY_ON(BrowserThread::IO);
793 DCHECK(initialized()); 793 DCHECK(initialized());
794 794
795 DCHECK(transport_security_state()); 795 DCHECK(transport_security_state());
796 // Completes synchronously. 796 // Completes synchronously.
797 transport_security_state()->DeleteAllDynamicDataSince(time); 797 transport_security_state()->DeleteAllDynamicDataSince(time);
798 DCHECK(http_server_properties_manager_); 798 DCHECK(http_server_properties_manager_);
799 http_server_properties_manager_->Clear(completion); 799 http_server_properties_manager_->Clear(completion);
800 } 800 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_io_data.cc ('k') | net/url_request/url_request_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698