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 1039 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1050 #endif | 1050 #endif |
1051 network_delegate->set_profile(profile_params_->profile); | 1051 network_delegate->set_profile(profile_params_->profile); |
1052 network_delegate->set_profile_path(profile_params_->path); | 1052 network_delegate->set_profile_path(profile_params_->path); |
1053 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); | 1053 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); |
1054 network_delegate->set_enable_do_not_track(&enable_do_not_track_); | 1054 network_delegate->set_enable_do_not_track(&enable_do_not_track_); |
1055 network_delegate->set_force_google_safe_search(&force_google_safesearch_); | 1055 network_delegate->set_force_google_safe_search(&force_google_safesearch_); |
1056 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_); | 1056 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_); |
1057 | 1057 |
1058 // NOTE: Proxy service uses the default io thread network delegate, not the | 1058 // NOTE: Proxy service uses the default io thread network delegate, not the |
1059 // delegate just created. | 1059 // delegate just created. |
1060 proxy_service_.reset( | 1060 proxy_service_.reset(ProxyServiceFactory::CreateProxyService( |
1061 ProxyServiceFactory::CreateProxyService( | 1061 io_thread->net_log(), |
1062 io_thread->net_log(), | 1062 io_thread_globals->proxy_script_fetcher_context.get(), |
1063 io_thread_globals->proxy_script_fetcher_context.get(), | 1063 io_thread_globals->system_network_delegate.get(), |
1064 io_thread_globals->system_network_delegate.get(), | 1064 profile_params_->proxy_config_service.Pass(), command_line, |
1065 profile_params_->proxy_config_service.release(), | 1065 quick_check_enabled_.GetValue())); |
1066 command_line, | |
1067 quick_check_enabled_.GetValue())); | |
1068 transport_security_state_.reset(new net::TransportSecurityState()); | 1066 transport_security_state_.reset(new net::TransportSecurityState()); |
1069 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); | 1067 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); |
1070 transport_security_persister_.reset( | 1068 transport_security_persister_.reset( |
1071 new net::TransportSecurityPersister( | 1069 new net::TransportSecurityPersister( |
1072 transport_security_state_.get(), | 1070 transport_security_state_.get(), |
1073 profile_params_->path, | 1071 profile_params_->path, |
1074 pool->GetSequencedTaskRunnerWithShutdownBehavior( | 1072 pool->GetSequencedTaskRunnerWithShutdownBehavior( |
1075 pool->GetSequenceToken(), | 1073 pool->GetSequenceToken(), |
1076 base::SequencedWorkerPool::BLOCK_SHUTDOWN), | 1074 base::SequencedWorkerPool::BLOCK_SHUTDOWN), |
1077 IsOffTheRecord())); | 1075 IsOffTheRecord())); |
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1325 new DevToolsNetworkTransactionFactory( | 1323 new DevToolsNetworkTransactionFactory( |
1326 network_controller_handle_.GetController(), shared_session), | 1324 network_controller_handle_.GetController(), shared_session), |
1327 shared_session->net_log(), backend)); | 1325 shared_session->net_log(), backend)); |
1328 } | 1326 } |
1329 | 1327 |
1330 void ProfileIOData::SetCookieSettingsForTesting( | 1328 void ProfileIOData::SetCookieSettingsForTesting( |
1331 content_settings::CookieSettings* cookie_settings) { | 1329 content_settings::CookieSettings* cookie_settings) { |
1332 DCHECK(!cookie_settings_.get()); | 1330 DCHECK(!cookie_settings_.get()); |
1333 cookie_settings_ = cookie_settings; | 1331 cookie_settings_ = cookie_settings; |
1334 } | 1332 } |
OLD | NEW |