| Index: chrome/browser/profiles/off_the_record_profile_io_data.h
|
| diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.h b/chrome/browser/profiles/off_the_record_profile_io_data.h
|
| index ed37d486a6d7355c293683d97df3c78b5d26e116..cfa6cb645047531472c21858b39fb964a509d37e 100644
|
| --- a/chrome/browser/profiles/off_the_record_profile_io_data.h
|
| +++ b/chrome/browser/profiles/off_the_record_profile_io_data.h
|
| @@ -44,16 +44,7 @@ class OffTheRecordProfileIOData : public ProfileIOData {
|
| content::ResourceContext* GetResourceContextNoInit() 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::ProtocolHandler>
|
| - developer_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_devtools_protocol_handler) const;
|
| + content::ProtocolHandlerMap* protocol_handlers) const;
|
| scoped_refptr<ChromeURLRequestContextGetter>
|
| GetExtensionsRequestContextGetter() const;
|
| scoped_refptr<ChromeURLRequestContextGetter>
|
| @@ -64,16 +55,7 @@ class OffTheRecordProfileIOData : public ProfileIOData {
|
| CreateIsolatedAppRequestContextGetter(
|
| const base::FilePath& partition_path,
|
| bool in_memory,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - blob_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - file_system_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - developer_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_devtools_protocol_handler) const;
|
| + content::ProtocolHandlerMap* protocol_handlers) const;
|
|
|
| private:
|
| typedef std::map<StoragePartitionDescriptor,
|
| @@ -120,16 +102,7 @@ class OffTheRecordProfileIOData : public ProfileIOData {
|
|
|
| virtual void InitializeInternal(
|
| ProfileParams* profile_params,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - blob_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - file_system_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - developer_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_devtools_protocol_handler) const OVERRIDE;
|
| + content::ProtocolHandlerMap* protocol_handlers) const OVERRIDE;
|
| virtual void InitializeExtensionsRequestContext(
|
| ProfileParams* profile_params) const OVERRIDE;
|
| virtual ChromeURLRequestContext* InitializeAppRequestContext(
|
| @@ -137,16 +110,7 @@ class OffTheRecordProfileIOData : public ProfileIOData {
|
| const StoragePartitionDescriptor& partition_descriptor,
|
| scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
|
| protocol_handler_interceptor,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - blob_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - file_system_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - developer_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_devtools_protocol_handler) const OVERRIDE;
|
| + content::ProtocolHandlerMap* protocol_handlers) const OVERRIDE;
|
| virtual ChromeURLRequestContext* InitializeMediaRequestContext(
|
| ChromeURLRequestContext* original_context,
|
| const StoragePartitionDescriptor& partition_descriptor) const OVERRIDE;
|
| @@ -158,16 +122,7 @@ class OffTheRecordProfileIOData : public ProfileIOData {
|
| const StoragePartitionDescriptor& partition_descriptor,
|
| scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
|
| protocol_handler_interceptor,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - blob_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - file_system_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - developer_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_devtools_protocol_handler) const OVERRIDE;
|
| + content::ProtocolHandlerMap* protocol_handlers) const OVERRIDE;
|
| virtual ChromeURLRequestContext*
|
| AcquireIsolatedMediaRequestContext(
|
| ChromeURLRequestContext* app_context,
|
|
|