Index: chrome/browser/profiles/profile_impl_io_data.h |
diff --git a/chrome/browser/profiles/profile_impl_io_data.h b/chrome/browser/profiles/profile_impl_io_data.h |
index 1eca955b6652b5c362e5fa3d51d014963230a9f6..32c65b2f3e7fd5879d249b95b7ecbb0ad0ac3e81 100644 |
--- a/chrome/browser/profiles/profile_impl_io_data.h |
+++ b/chrome/browser/profiles/profile_impl_io_data.h |
@@ -172,8 +172,8 @@ class ProfileImplIOData : public ProfileIOData { |
scoped_ptr<ChromeNetworkDelegate> chrome_network_delegate, |
ProfileParams* profile_params, |
content::ProtocolHandlerMap* protocol_handlers, |
- content::URLRequestInterceptorScopedVector |
- request_interceptors) const override; |
+ content::URLRequestInterceptorScopedVector request_interceptors, |
+ net::URLRequestContextBuilder* context_builder) const override; |
void InitializeExtensionsRequestContext( |
ProfileParams* profile_params) const override; |
net::URLRequestContext* InitializeAppRequestContext( |
@@ -200,6 +200,9 @@ class ProfileImplIOData : public ProfileIOData { |
net::URLRequestContext* app_context, |
const StoragePartitionDescriptor& partition_descriptor) const override; |
+ void InitPostContextSetup( |
+ ChromeNetworkDelegate* chrome_network_delegate) const override; |
+ |
// Deletes all network related data since |time|. It deletes transport |
// security state since |time| and also deletes HttpServerProperties data. |
// Works asynchronously, however if the |completion| callback is non-null, |
@@ -207,15 +210,11 @@ class ProfileImplIOData : public ProfileIOData { |
void ClearNetworkingHistorySinceOnIOThread(base::Time time, |
const base::Closure& completion); |
- mutable scoped_ptr<data_reduction_proxy::DataReductionProxyNetworkDelegate> |
- network_delegate_; |
- |
// Lazy initialization params. |
mutable scoped_ptr<LazyParams> lazy_params_; |
mutable scoped_refptr<JsonPrefStore> network_json_store_; |
- mutable scoped_ptr<net::HttpTransactionFactory> main_http_factory_; |
mutable scoped_ptr<net::FtpTransactionFactory> ftp_factory_; |
// Same as |ProfileIOData::http_server_properties_|, owned there to maintain |
@@ -226,7 +225,6 @@ class ProfileImplIOData : public ProfileIOData { |
mutable scoped_ptr<net::URLRequestContext> media_request_context_; |
- mutable scoped_ptr<net::URLRequestJobFactory> main_job_factory_; |
mutable scoped_ptr<net::URLRequestJobFactory> extensions_job_factory_; |
mutable scoped_ptr<domain_reliability::DomainReliabilityMonitor> |