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 670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
681 io_thread_globals->proxy_script_fetcher_context.get(), | 681 io_thread_globals->proxy_script_fetcher_context.get(), |
682 io_thread_globals->system_network_delegate.get(), | 682 io_thread_globals->system_network_delegate.get(), |
683 profile_params_->proxy_config_service.release(), | 683 profile_params_->proxy_config_service.release(), |
684 command_line)); | 684 command_line)); |
685 | 685 |
686 transport_security_state_.reset(new net::TransportSecurityState()); | 686 transport_security_state_.reset(new net::TransportSecurityState()); |
687 transport_security_persister_.reset( | 687 transport_security_persister_.reset( |
688 new TransportSecurityPersister(transport_security_state_.get(), | 688 new TransportSecurityPersister(transport_security_state_.get(), |
689 profile_params_->path, | 689 profile_params_->path, |
690 is_incognito())); | 690 is_incognito())); |
691 const std::string& serialized = | |
692 command_line.GetSwitchValueASCII(switches::kHstsHosts); | |
693 transport_security_persister_.get()->DeserializeFromCommandLine(serialized); | |
694 | 691 |
695 // Take ownership over these parameters. | 692 // Take ownership over these parameters. |
696 cookie_settings_ = profile_params_->cookie_settings; | 693 cookie_settings_ = profile_params_->cookie_settings; |
697 #if defined(ENABLE_NOTIFICATIONS) | 694 #if defined(ENABLE_NOTIFICATIONS) |
698 notification_service_ = profile_params_->notification_service; | 695 notification_service_ = profile_params_->notification_service; |
699 #endif | 696 #endif |
700 extension_info_map_ = profile_params_->extension_info_map; | 697 extension_info_map_ = profile_params_->extension_info_map; |
701 | 698 |
702 resource_context_->host_resolver_ = io_thread_globals->host_resolver.get(); | 699 resource_context_->host_resolver_ = io_thread_globals->host_resolver.get(); |
703 resource_context_->request_context_ = main_request_context_.get(); | 700 resource_context_->request_context_ = main_request_context_.get(); |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
860 void ProfileIOData::SetCookieSettingsForTesting( | 857 void ProfileIOData::SetCookieSettingsForTesting( |
861 CookieSettings* cookie_settings) { | 858 CookieSettings* cookie_settings) { |
862 DCHECK(!cookie_settings_); | 859 DCHECK(!cookie_settings_); |
863 cookie_settings_ = cookie_settings; | 860 cookie_settings_ = cookie_settings; |
864 } | 861 } |
865 | 862 |
866 void ProfileIOData::set_signin_names_for_testing( | 863 void ProfileIOData::set_signin_names_for_testing( |
867 SigninNamesOnIOThread* signin_names) { | 864 SigninNamesOnIOThread* signin_names) { |
868 signin_names_.reset(signin_names); | 865 signin_names_.reset(signin_names); |
869 } | 866 } |
OLD | NEW |