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 1025 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1036 // delegate just created. | 1036 // delegate just created. |
1037 proxy_service_.reset( | 1037 proxy_service_.reset( |
1038 ProxyServiceFactory::CreateProxyService( | 1038 ProxyServiceFactory::CreateProxyService( |
1039 io_thread->net_log(), | 1039 io_thread->net_log(), |
1040 io_thread_globals->proxy_script_fetcher_context.get(), | 1040 io_thread_globals->proxy_script_fetcher_context.get(), |
1041 io_thread_globals->system_network_delegate.get(), | 1041 io_thread_globals->system_network_delegate.get(), |
1042 profile_params_->proxy_config_service.release(), | 1042 profile_params_->proxy_config_service.release(), |
1043 command_line, | 1043 command_line, |
1044 quick_check_enabled_.GetValue())); | 1044 quick_check_enabled_.GetValue())); |
1045 transport_security_state_.reset(new net::TransportSecurityState()); | 1045 transport_security_state_.reset(new net::TransportSecurityState()); |
| 1046 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); |
1046 transport_security_persister_.reset( | 1047 transport_security_persister_.reset( |
1047 new net::TransportSecurityPersister( | 1048 new net::TransportSecurityPersister( |
1048 transport_security_state_.get(), | 1049 transport_security_state_.get(), |
1049 profile_params_->path, | 1050 profile_params_->path, |
1050 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE), | 1051 pool->GetSequencedTaskRunnerWithShutdownBehavior( |
| 1052 pool->GetSequenceToken(), |
| 1053 base::SequencedWorkerPool::BLOCK_SHUTDOWN), |
1051 IsOffTheRecord())); | 1054 IsOffTheRecord())); |
1052 | 1055 |
1053 // Take ownership over these parameters. | 1056 // Take ownership over these parameters. |
1054 cookie_settings_ = profile_params_->cookie_settings; | 1057 cookie_settings_ = profile_params_->cookie_settings; |
1055 host_content_settings_map_ = profile_params_->host_content_settings_map; | 1058 host_content_settings_map_ = profile_params_->host_content_settings_map; |
1056 #if defined(ENABLE_EXTENSIONS) | 1059 #if defined(ENABLE_EXTENSIONS) |
1057 extension_info_map_ = profile_params_->extension_info_map; | 1060 extension_info_map_ = profile_params_->extension_info_map; |
1058 #endif | 1061 #endif |
1059 | 1062 |
1060 resource_context_->host_resolver_ = io_thread_globals->host_resolver.get(); | 1063 resource_context_->host_resolver_ = io_thread_globals->host_resolver.get(); |
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1297 void ProfileIOData::SetCookieSettingsForTesting( | 1300 void ProfileIOData::SetCookieSettingsForTesting( |
1298 CookieSettings* cookie_settings) { | 1301 CookieSettings* cookie_settings) { |
1299 DCHECK(!cookie_settings_.get()); | 1302 DCHECK(!cookie_settings_.get()); |
1300 cookie_settings_ = cookie_settings; | 1303 cookie_settings_ = cookie_settings; |
1301 } | 1304 } |
1302 | 1305 |
1303 void ProfileIOData::set_signin_names_for_testing( | 1306 void ProfileIOData::set_signin_names_for_testing( |
1304 SigninNamesOnIOThread* signin_names) { | 1307 SigninNamesOnIOThread* signin_names) { |
1305 signin_names_.reset(signin_names); | 1308 signin_names_.reset(signin_names); |
1306 } | 1309 } |
OLD | NEW |