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 924 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
935 // Create the common request contexts. | 935 // Create the common request contexts. |
936 main_request_context_.reset(new ChromeURLRequestContext()); | 936 main_request_context_.reset(new ChromeURLRequestContext()); |
937 extensions_request_context_.reset(new ChromeURLRequestContext()); | 937 extensions_request_context_.reset(new ChromeURLRequestContext()); |
938 | 938 |
939 ChromeNetworkDelegate* network_delegate = | 939 ChromeNetworkDelegate* network_delegate = |
940 new ChromeNetworkDelegate( | 940 new ChromeNetworkDelegate( |
941 io_thread_globals->extension_event_router_forwarder.get(), | 941 io_thread_globals->extension_event_router_forwarder.get(), |
942 &enable_referrers_); | 942 &enable_referrers_); |
943 network_delegate->set_data_reduction_proxy_params( | 943 network_delegate->set_data_reduction_proxy_params( |
944 io_thread_globals->data_reduction_proxy_params.get()); | 944 io_thread_globals->data_reduction_proxy_params.get()); |
| 945 network_delegate->set_data_reduction_proxy_auth_request_handler( |
| 946 io_thread_globals->data_reduction_proxy_auth_request_handler.get()); |
945 if (command_line.HasSwitch(switches::kEnableClientHints)) | 947 if (command_line.HasSwitch(switches::kEnableClientHints)) |
946 network_delegate->SetEnableClientHints(); | 948 network_delegate->SetEnableClientHints(); |
947 network_delegate->set_extension_info_map( | 949 network_delegate->set_extension_info_map( |
948 profile_params_->extension_info_map.get()); | 950 profile_params_->extension_info_map.get()); |
949 #if defined(ENABLE_CONFIGURATION_POLICY) | 951 #if defined(ENABLE_CONFIGURATION_POLICY) |
950 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); | 952 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); |
951 #endif | 953 #endif |
952 network_delegate->set_profile(profile_params_->profile); | 954 network_delegate->set_profile(profile_params_->profile); |
953 network_delegate->set_profile_path(profile_params_->path); | 955 network_delegate->set_profile_path(profile_params_->path); |
954 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); | 956 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); |
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1191 void ProfileIOData::SetCookieSettingsForTesting( | 1193 void ProfileIOData::SetCookieSettingsForTesting( |
1192 CookieSettings* cookie_settings) { | 1194 CookieSettings* cookie_settings) { |
1193 DCHECK(!cookie_settings_.get()); | 1195 DCHECK(!cookie_settings_.get()); |
1194 cookie_settings_ = cookie_settings; | 1196 cookie_settings_ = cookie_settings; |
1195 } | 1197 } |
1196 | 1198 |
1197 void ProfileIOData::set_signin_names_for_testing( | 1199 void ProfileIOData::set_signin_names_for_testing( |
1198 SigninNamesOnIOThread* signin_names) { | 1200 SigninNamesOnIOThread* signin_names) { |
1199 signin_names_.reset(signin_names); | 1201 signin_names_.reset(signin_names); |
1200 } | 1202 } |
OLD | NEW |