| Index: chrome/browser/profiles/profile_io_data.cc
|
| diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
|
| index 94c8d6fb76f79cd353a156c7f58ba85e31f3e242..41df68401c59df7230aa47e8f3c26878f1f4b7ba 100644
|
| --- a/chrome/browser/profiles/profile_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_io_data.cc
|
| @@ -40,6 +40,7 @@
|
| #include "chrome/browser/net/chrome_net_log.h"
|
| #include "chrome/browser/net/chrome_network_delegate.h"
|
| #include "chrome/browser/net/cookie_store_util.h"
|
| +#include "chrome/browser/net/network_controller.h"
|
| #include "chrome/browser/net/proxy_service_factory.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| @@ -1130,28 +1131,34 @@ void ProfileIOData::DestroyResourceContext() {
|
| resource_context_.reset();
|
| }
|
|
|
| -void ProfileIOData::PopulateNetworkSessionParams(
|
| +scoped_ptr<net::HttpCache> ProfileIOData::CreateMainHttpFactory(
|
| const ProfileParams* profile_params,
|
| - net::HttpNetworkSession::Params* params) const {
|
| -
|
| + net::HttpCache::BackendFactory* main_backend) const {
|
| + net::HttpNetworkSession::Params params;
|
| ChromeURLRequestContext* context = main_request_context();
|
|
|
| IOThread* const io_thread = profile_params->io_thread;
|
|
|
| - io_thread->InitializeNetworkSessionParams(params);
|
| -
|
| - params->host_resolver = context->host_resolver();
|
| - params->cert_verifier = context->cert_verifier();
|
| - params->server_bound_cert_service = context->server_bound_cert_service();
|
| - params->transport_security_state = context->transport_security_state();
|
| - params->cert_transparency_verifier = context->cert_transparency_verifier();
|
| - params->proxy_service = context->proxy_service();
|
| - params->ssl_session_cache_shard = GetSSLSessionCacheShard();
|
| - params->ssl_config_service = context->ssl_config_service();
|
| - params->http_auth_handler_factory = context->http_auth_handler_factory();
|
| - params->network_delegate = network_delegate();
|
| - params->http_server_properties = context->http_server_properties();
|
| - params->net_log = context->net_log();
|
| + io_thread->InitializeNetworkSessionParams(¶ms);
|
| +
|
| + params.host_resolver = context->host_resolver();
|
| + params.cert_verifier = context->cert_verifier();
|
| + params.server_bound_cert_service = context->server_bound_cert_service();
|
| + params.transport_security_state = context->transport_security_state();
|
| + params.cert_transparency_verifier = context->cert_transparency_verifier();
|
| + params.proxy_service = context->proxy_service();
|
| + params.ssl_session_cache_shard = GetSSLSessionCacheShard();
|
| + params.ssl_config_service = context->ssl_config_service();
|
| + params.http_auth_handler_factory = context->http_auth_handler_factory();
|
| + params.network_delegate = network_delegate();
|
| + params.http_server_properties = context->http_server_properties();
|
| + params.net_log = context->net_log();
|
| +
|
| + network_controller_ =
|
| + new NetworkController(new net::HttpNetworkSession(params));
|
| +
|
| + return scoped_ptr<net::HttpCache>(new net::HttpCache(
|
| + network_controller_, params.net_log, main_backend));
|
| }
|
|
|
| void ProfileIOData::SetCookieSettingsForTesting(
|
|
|