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 654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
665 io_thread->net_log(), | 665 io_thread->net_log(), |
666 io_thread_globals->proxy_script_fetcher_context.get(), | 666 io_thread_globals->proxy_script_fetcher_context.get(), |
667 profile_params_->proxy_config_service.release(), | 667 profile_params_->proxy_config_service.release(), |
668 command_line)); | 668 command_line)); |
669 | 669 |
670 transport_security_state_.reset(new net::TransportSecurityState()); | 670 transport_security_state_.reset(new net::TransportSecurityState()); |
671 transport_security_persister_.reset( | 671 transport_security_persister_.reset( |
672 new TransportSecurityPersister(transport_security_state_.get(), | 672 new TransportSecurityPersister(transport_security_state_.get(), |
673 profile_params_->path, | 673 profile_params_->path, |
674 is_incognito())); | 674 is_incognito())); |
675 const std::string& serialized = | |
676 command_line.GetSwitchValueASCII(switches::kHstsHosts); | |
677 transport_security_persister_.get()->DeserializeFromCommandLine(serialized); | |
palmer
2013/03/25 23:54:34
I tried to get rid of this once before, and cevans
unsafe
2013/03/26 01:42:22
http://scarybeastsecurity.blogspot.com/2011/04/fid
| |
678 | 675 |
679 // Take ownership over these parameters. | 676 // Take ownership over these parameters. |
680 cookie_settings_ = profile_params_->cookie_settings; | 677 cookie_settings_ = profile_params_->cookie_settings; |
681 #if defined(ENABLE_NOTIFICATIONS) | 678 #if defined(ENABLE_NOTIFICATIONS) |
682 notification_service_ = profile_params_->notification_service; | 679 notification_service_ = profile_params_->notification_service; |
683 #endif | 680 #endif |
684 extension_info_map_ = profile_params_->extension_info_map; | 681 extension_info_map_ = profile_params_->extension_info_map; |
685 | 682 |
686 resource_context_->host_resolver_ = io_thread_globals->host_resolver.get(); | 683 resource_context_->host_resolver_ = io_thread_globals->host_resolver.get(); |
687 resource_context_->request_context_ = main_request_context_.get(); | 684 resource_context_->request_context_ = main_request_context_.get(); |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
842 void ProfileIOData::SetCookieSettingsForTesting( | 839 void ProfileIOData::SetCookieSettingsForTesting( |
843 CookieSettings* cookie_settings) { | 840 CookieSettings* cookie_settings) { |
844 DCHECK(!cookie_settings_.get()); | 841 DCHECK(!cookie_settings_.get()); |
845 cookie_settings_ = cookie_settings; | 842 cookie_settings_ = cookie_settings; |
846 } | 843 } |
847 | 844 |
848 void ProfileIOData::set_signin_names_for_testing( | 845 void ProfileIOData::set_signin_names_for_testing( |
849 SigninNamesOnIOThread* signin_names) { | 846 SigninNamesOnIOThread* signin_names) { |
850 signin_names_.reset(signin_names); | 847 signin_names_.reset(signin_names); |
851 } | 848 } |
OLD | NEW |