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 04b66b2ddf8e87c19b06239c63227fc95d6f8af2..a903199e3a323a9599eac35e6aa5dbd5c705dc52 100644 |
--- a/chrome/browser/profiles/profile_impl_io_data.h |
+++ b/chrome/browser/profiles/profile_impl_io_data.h |
@@ -62,13 +62,27 @@ class ProfileImplIOData : public ProfileIOData { |
scoped_refptr<ChromeURLRequestContextGetter> |
GetMainRequestContextGetter() const; |
scoped_refptr<ChromeURLRequestContextGetter> |
+ CreateMainRequestContextGetter( |
+ scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> |
+ blob_protocol_handler, |
+ scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> |
+ file_system_protocol_handler, |
+ scoped_ptr<net::URLRequestJobFactory::Interceptor> |
+ developer_protocol_handler) const; |
+ scoped_refptr<ChromeURLRequestContextGetter> |
GetMediaRequestContextGetter() const; |
scoped_refptr<ChromeURLRequestContextGetter> |
GetExtensionsRequestContextGetter() const; |
scoped_refptr<ChromeURLRequestContextGetter> |
- GetIsolatedAppRequestContextGetter( |
+ CreateIsolatedAppRequestContextGetter( |
const FilePath& partition_path, |
- bool in_memory) const; |
+ bool in_memory, |
+ scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> |
+ blob_protocol_handler, |
+ scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> |
+ file_system_protocol_handler, |
+ scoped_ptr<net::URLRequestJobFactory::Interceptor> |
+ developer_protocol_handler) const; |
scoped_refptr<ChromeURLRequestContextGetter> |
GetIsolatedMediaRequestContextGetter( |
const FilePath& partition_path, |
@@ -112,6 +126,8 @@ class ProfileImplIOData : public ProfileIOData { |
ProfileImplIOData* const io_data_; |
Profile* const profile_; |
+ PrefService* local_state_; |
awong
2012/12/12 03:44:37
What's our guarantee on the lifetime of local_stat
pauljensen
2012/12/12 18:39:37
I removed these and just made them arguments of Cr
|
+ IOThread* io_thread_; |
mutable bool initialized_; |
@@ -145,14 +161,26 @@ class ProfileImplIOData : public ProfileIOData { |
virtual ~ProfileImplIOData(); |
virtual void LazyInitializeInternal( |
- ProfileParams* profile_params) const OVERRIDE; |
+ ProfileParams* profile_params, |
+ scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> |
+ blob_protocol_handler, |
+ scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> |
+ file_system_protocol_handler, |
+ scoped_ptr<net::URLRequestJobFactory::Interceptor> |
+ developer_protocol_handler) const OVERRIDE; |
virtual void InitializeExtensionsRequestContext( |
ProfileParams* profile_params) const OVERRIDE; |
virtual ChromeURLRequestContext* InitializeAppRequestContext( |
ChromeURLRequestContext* main_context, |
const StoragePartitionDescriptor& partition_descriptor, |
scoped_ptr<net::URLRequestJobFactory::Interceptor> |
- protocol_handler_interceptor) const OVERRIDE; |
+ protocol_handler_interceptor, |
+ scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> |
+ blob_protocol_handler, |
+ scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> |
+ file_system_protocol_handler, |
+ scoped_ptr<net::URLRequestJobFactory::Interceptor> |
+ developer_protocol_handler) const OVERRIDE; |
virtual ChromeURLRequestContext* InitializeMediaRequestContext( |
ChromeURLRequestContext* original_context, |
const StoragePartitionDescriptor& partition_descriptor) const OVERRIDE; |
@@ -163,7 +191,13 @@ class ProfileImplIOData : public ProfileIOData { |
ChromeURLRequestContext* main_context, |
const StoragePartitionDescriptor& partition_descriptor, |
scoped_ptr<net::URLRequestJobFactory::Interceptor> |
- protocol_handler_interceptor) const OVERRIDE; |
+ protocol_handler_interceptor, |
+ scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> |
+ blob_protocol_handler, |
+ scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> |
+ file_system_protocol_handler, |
+ scoped_ptr<net::URLRequestJobFactory::Interceptor> |
+ developer_protocol_handler) const OVERRIDE; |
virtual ChromeURLRequestContext* |
AcquireIsolatedMediaRequestContext( |
ChromeURLRequestContext* app_context, |