| Index: chrome/browser/net/chrome_url_request_context.h
|
| diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
|
| index 8958fa8291fb3e8b09a3751780478f9ca98f36f9..1a2c65edb7b27535ae4a66b9fd27249cf621065d 100644
|
| --- a/chrome/browser/net/chrome_url_request_context.h
|
| +++ b/chrome/browser/net/chrome_url_request_context.h
|
| @@ -98,16 +98,7 @@ class ChromeURLRequestContextGetter : public net::URLRequestContextGetter {
|
| static ChromeURLRequestContextGetter* CreateOriginal(
|
| Profile* profile,
|
| const ProfileIOData* profile_io_data,
|
| - 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);
|
| + content::ProtocolHandlerMap* protocol_handlers);
|
|
|
| // Create an instance for an original profile for media. This is expected to
|
| // get called on UI thread. This method takes a profile and reuses the
|
| @@ -128,16 +119,7 @@ class ChromeURLRequestContextGetter : public net::URLRequestContextGetter {
|
| 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);
|
| + content::ProtocolHandlerMap* protocol_handlers);
|
|
|
| // Create an instance for an original profile for media with isolated
|
| // storage. This is expected to get called on UI thread.
|
| @@ -152,16 +134,7 @@ class ChromeURLRequestContextGetter : public net::URLRequestContextGetter {
|
| static ChromeURLRequestContextGetter* CreateOffTheRecord(
|
| Profile* profile,
|
| const ProfileIOData* profile_io_data,
|
| - 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);
|
| + content::ProtocolHandlerMap* protocol_handlers);
|
|
|
| // Create an instance for an OTR profile for extensions. This is expected
|
| // to get called on UI thread.
|
| @@ -176,16 +149,7 @@ class ChromeURLRequestContextGetter : public net::URLRequestContextGetter {
|
| 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);
|
| + content::ProtocolHandlerMap* protocol_handlers);
|
|
|
| private:
|
| virtual ~ChromeURLRequestContextGetter();
|
|
|