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 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1059 | 1059 |
1060 #if defined(ENABLE_CONFIGURATION_POLICY) | 1060 #if defined(ENABLE_CONFIGURATION_POLICY) |
1061 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); | 1061 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); |
1062 #endif | 1062 #endif |
1063 network_delegate->set_profile(profile_params_->profile); | 1063 network_delegate->set_profile(profile_params_->profile); |
1064 network_delegate->set_profile_path(profile_params_->path); | 1064 network_delegate->set_profile_path(profile_params_->path); |
1065 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); | 1065 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); |
1066 network_delegate->set_enable_do_not_track(&enable_do_not_track_); | 1066 network_delegate->set_enable_do_not_track(&enable_do_not_track_); |
1067 network_delegate->set_force_google_safe_search(&force_google_safesearch_); | 1067 network_delegate->set_force_google_safe_search(&force_google_safesearch_); |
1068 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_); | 1068 network_delegate->set_force_youtube_safety_mode(&force_youtube_safety_mode_); |
| 1069 network_delegate->set_data_use_aggregator( |
| 1070 io_thread_globals->data_use_aggregator.get(), IsOffTheRecord()); |
1069 | 1071 |
1070 // NOTE: Proxy service uses the default io thread network delegate, not the | 1072 // NOTE: Proxy service uses the default io thread network delegate, not the |
1071 // delegate just created. | 1073 // delegate just created. |
1072 proxy_service_ = ProxyServiceFactory::CreateProxyService( | 1074 proxy_service_ = ProxyServiceFactory::CreateProxyService( |
1073 io_thread->net_log(), | 1075 io_thread->net_log(), |
1074 io_thread_globals->proxy_script_fetcher_context.get(), | 1076 io_thread_globals->proxy_script_fetcher_context.get(), |
1075 io_thread_globals->system_network_delegate.get(), | 1077 io_thread_globals->system_network_delegate.get(), |
1076 profile_params_->proxy_config_service.Pass(), command_line, | 1078 profile_params_->proxy_config_service.Pass(), command_line, |
1077 quick_check_enabled_.GetValue()); | 1079 quick_check_enabled_.GetValue()); |
1078 transport_security_state_.reset(new net::TransportSecurityState()); | 1080 transport_security_state_.reset(new net::TransportSecurityState()); |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1334 new DevToolsNetworkTransactionFactory( | 1336 new DevToolsNetworkTransactionFactory( |
1335 network_controller_handle_.GetController(), shared_session), | 1337 network_controller_handle_.GetController(), shared_session), |
1336 shared_session->net_log(), backend)); | 1338 shared_session->net_log(), backend)); |
1337 } | 1339 } |
1338 | 1340 |
1339 void ProfileIOData::SetCookieSettingsForTesting( | 1341 void ProfileIOData::SetCookieSettingsForTesting( |
1340 content_settings::CookieSettings* cookie_settings) { | 1342 content_settings::CookieSettings* cookie_settings) { |
1341 DCHECK(!cookie_settings_.get()); | 1343 DCHECK(!cookie_settings_.get()); |
1342 cookie_settings_ = cookie_settings; | 1344 cookie_settings_ = cookie_settings; |
1343 } | 1345 } |
OLD | NEW |