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 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1063 #endif | 1063 #endif |
1064 network_delegate->set_profile(profile_params_->profile); | 1064 network_delegate->set_profile(profile_params_->profile); |
1065 network_delegate->set_profile_path(profile_params_->path); | 1065 network_delegate->set_profile_path(profile_params_->path); |
1066 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); | 1066 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); |
1067 network_delegate->set_enable_do_not_track(&enable_do_not_track_); | 1067 network_delegate->set_enable_do_not_track(&enable_do_not_track_); |
1068 network_delegate->set_force_google_safe_search(&force_google_safesearch_); | 1068 network_delegate->set_force_google_safe_search(&force_google_safesearch_); |
1069 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_); | 1069 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_); |
1070 | 1070 |
1071 // NOTE: Proxy service uses the default io thread network delegate, not the | 1071 // NOTE: Proxy service uses the default io thread network delegate, not the |
1072 // delegate just created. | 1072 // delegate just created. |
1073 proxy_service_.reset( | 1073 proxy_service_ = ProxyServiceFactory::CreateProxyService( |
1074 ProxyServiceFactory::CreateProxyService( | 1074 io_thread->net_log(), |
1075 io_thread->net_log(), | 1075 io_thread_globals->proxy_script_fetcher_context.get(), |
1076 io_thread_globals->proxy_script_fetcher_context.get(), | 1076 io_thread_globals->system_network_delegate.get(), |
1077 io_thread_globals->system_network_delegate.get(), | 1077 profile_params_->proxy_config_service.release(), command_line, |
1078 profile_params_->proxy_config_service.release(), | 1078 quick_check_enabled_.GetValue()); |
1079 command_line, | |
1080 quick_check_enabled_.GetValue())); | |
1081 transport_security_state_.reset(new net::TransportSecurityState()); | 1079 transport_security_state_.reset(new net::TransportSecurityState()); |
1082 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); | 1080 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); |
1083 transport_security_persister_.reset( | 1081 transport_security_persister_.reset( |
1084 new net::TransportSecurityPersister( | 1082 new net::TransportSecurityPersister( |
1085 transport_security_state_.get(), | 1083 transport_security_state_.get(), |
1086 profile_params_->path, | 1084 profile_params_->path, |
1087 pool->GetSequencedTaskRunnerWithShutdownBehavior( | 1085 pool->GetSequencedTaskRunnerWithShutdownBehavior( |
1088 pool->GetSequenceToken(), | 1086 pool->GetSequenceToken(), |
1089 base::SequencedWorkerPool::BLOCK_SHUTDOWN), | 1087 base::SequencedWorkerPool::BLOCK_SHUTDOWN), |
1090 IsOffTheRecord())); | 1088 IsOffTheRecord())); |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1337 new DevToolsNetworkTransactionFactory( | 1335 new DevToolsNetworkTransactionFactory( |
1338 network_controller_handle_.GetController(), shared_session), | 1336 network_controller_handle_.GetController(), shared_session), |
1339 shared_session->net_log(), backend)); | 1337 shared_session->net_log(), backend)); |
1340 } | 1338 } |
1341 | 1339 |
1342 void ProfileIOData::SetCookieSettingsForTesting( | 1340 void ProfileIOData::SetCookieSettingsForTesting( |
1343 content_settings::CookieSettings* cookie_settings) { | 1341 content_settings::CookieSettings* cookie_settings) { |
1344 DCHECK(!cookie_settings_.get()); | 1342 DCHECK(!cookie_settings_.get()); |
1345 cookie_settings_ = cookie_settings; | 1343 cookie_settings_ = cookie_settings; |
1346 } | 1344 } |
OLD | NEW |