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 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1250 net::HttpCache::BackendFactory* main_backend) const { | 1250 net::HttpCache::BackendFactory* main_backend) const { |
1251 net::HttpNetworkSession::Params params; | 1251 net::HttpNetworkSession::Params params; |
1252 net::URLRequestContext* context = main_request_context(); | 1252 net::URLRequestContext* context = main_request_context(); |
1253 | 1253 |
1254 IOThread* const io_thread = profile_params->io_thread; | 1254 IOThread* const io_thread = profile_params->io_thread; |
1255 | 1255 |
1256 io_thread->InitializeNetworkSessionParams(¶ms); | 1256 io_thread->InitializeNetworkSessionParams(¶ms); |
1257 | 1257 |
1258 params.host_resolver = context->host_resolver(); | 1258 params.host_resolver = context->host_resolver(); |
1259 params.cert_verifier = context->cert_verifier(); | 1259 params.cert_verifier = context->cert_verifier(); |
| 1260 params.cert_policy_enforcer = context->cert_policy_enforcer(); |
1260 params.channel_id_service = context->channel_id_service(); | 1261 params.channel_id_service = context->channel_id_service(); |
1261 params.transport_security_state = context->transport_security_state(); | 1262 params.transport_security_state = context->transport_security_state(); |
1262 params.cert_transparency_verifier = context->cert_transparency_verifier(); | 1263 params.cert_transparency_verifier = context->cert_transparency_verifier(); |
1263 params.proxy_service = context->proxy_service(); | 1264 params.proxy_service = context->proxy_service(); |
1264 params.ssl_session_cache_shard = GetSSLSessionCacheShard(); | 1265 params.ssl_session_cache_shard = GetSSLSessionCacheShard(); |
1265 params.ssl_config_service = context->ssl_config_service(); | 1266 params.ssl_config_service = context->ssl_config_service(); |
1266 params.http_auth_handler_factory = context->http_auth_handler_factory(); | 1267 params.http_auth_handler_factory = context->http_auth_handler_factory(); |
1267 params.network_delegate = network_delegate(); | 1268 params.network_delegate = network_delegate(); |
1268 params.http_server_properties = context->http_server_properties(); | 1269 params.http_server_properties = context->http_server_properties(); |
1269 params.net_log = context->net_log(); | 1270 params.net_log = context->net_log(); |
(...skipping 18 matching lines...) Expand all Loading... |
1288 void ProfileIOData::SetCookieSettingsForTesting( | 1289 void ProfileIOData::SetCookieSettingsForTesting( |
1289 CookieSettings* cookie_settings) { | 1290 CookieSettings* cookie_settings) { |
1290 DCHECK(!cookie_settings_.get()); | 1291 DCHECK(!cookie_settings_.get()); |
1291 cookie_settings_ = cookie_settings; | 1292 cookie_settings_ = cookie_settings; |
1292 } | 1293 } |
1293 | 1294 |
1294 void ProfileIOData::set_signin_names_for_testing( | 1295 void ProfileIOData::set_signin_names_for_testing( |
1295 SigninNamesOnIOThread* signin_names) { | 1296 SigninNamesOnIOThread* signin_names) { |
1296 signin_names_.reset(signin_names); | 1297 signin_names_.reset(signin_names); |
1297 } | 1298 } |
OLD | NEW |