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 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
629 new ChromeURLRequestContext(ChromeURLRequestContext::CONTEXT_TYPE_MAIN, | 629 new ChromeURLRequestContext(ChromeURLRequestContext::CONTEXT_TYPE_MAIN, |
630 load_time_stats_)); | 630 load_time_stats_)); |
631 extensions_request_context_.reset( | 631 extensions_request_context_.reset( |
632 new ChromeURLRequestContext( | 632 new ChromeURLRequestContext( |
633 ChromeURLRequestContext::CONTEXT_TYPE_EXTENSIONS, | 633 ChromeURLRequestContext::CONTEXT_TYPE_EXTENSIONS, |
634 load_time_stats_)); | 634 load_time_stats_)); |
635 | 635 |
636 ChromeNetworkDelegate* network_delegate = | 636 ChromeNetworkDelegate* network_delegate = |
637 new ChromeNetworkDelegate( | 637 new ChromeNetworkDelegate( |
638 io_thread_globals->extension_event_router_forwarder.get(), | 638 io_thread_globals->extension_event_router_forwarder.get(), |
639 &enable_referrers_); | 639 &enable_referrers_, |
| 640 command_line.HasSwitch(switches::kEnableClientHints)); |
640 network_delegate->set_extension_info_map(profile_params_->extension_info_map); | 641 network_delegate->set_extension_info_map(profile_params_->extension_info_map); |
641 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); | 642 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); |
642 network_delegate->set_profile(profile_params_->profile); | 643 network_delegate->set_profile(profile_params_->profile); |
643 network_delegate->set_cookie_settings(profile_params_->cookie_settings); | 644 network_delegate->set_cookie_settings(profile_params_->cookie_settings); |
644 network_delegate->set_enable_do_not_track(&enable_do_not_track_); | 645 network_delegate->set_enable_do_not_track(&enable_do_not_track_); |
645 network_delegate->set_force_google_safe_search(&force_safesearch_); | 646 network_delegate->set_force_google_safe_search(&force_safesearch_); |
646 network_delegate->set_load_time_stats(load_time_stats_); | 647 network_delegate->set_load_time_stats(load_time_stats_); |
647 network_delegate_.reset(network_delegate); | 648 network_delegate_.reset(network_delegate); |
648 | 649 |
649 fraudulent_certificate_reporter_.reset( | 650 fraudulent_certificate_reporter_.reset( |
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
821 void ProfileIOData::SetCookieSettingsForTesting( | 822 void ProfileIOData::SetCookieSettingsForTesting( |
822 CookieSettings* cookie_settings) { | 823 CookieSettings* cookie_settings) { |
823 DCHECK(!cookie_settings_.get()); | 824 DCHECK(!cookie_settings_.get()); |
824 cookie_settings_ = cookie_settings; | 825 cookie_settings_ = cookie_settings; |
825 } | 826 } |
826 | 827 |
827 void ProfileIOData::set_signin_names_for_testing( | 828 void ProfileIOData::set_signin_names_for_testing( |
828 SigninNamesOnIOThread* signin_names) { | 829 SigninNamesOnIOThread* signin_names) { |
829 signin_names_.reset(signin_names); | 830 signin_names_.reset(signin_names); |
830 } | 831 } |
OLD | NEW |