| 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 3d54bba8c3400480dff5a400d2a4693d80cc46cc..8958fa8291fb3e8b09a3751780478f9ca98f36f9 100644
|
| --- a/chrome/browser/net/chrome_url_request_context.h
|
| +++ b/chrome/browser/net/chrome_url_request_context.h
|
| @@ -96,7 +96,18 @@ class ChromeURLRequestContextGetter : public net::URLRequestContextGetter {
|
| // Create an instance for use with an 'original' (non-OTR) profile. This is
|
| // expected to get called on the UI thread.
|
| static ChromeURLRequestContextGetter* CreateOriginal(
|
| - Profile* profile, const ProfileIOData* profile_io_data);
|
| + 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);
|
|
|
| // 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
|
| @@ -116,7 +127,17 @@ class ChromeURLRequestContextGetter : public net::URLRequestContextGetter {
|
| const ProfileIOData* profile_io_data,
|
| const StoragePartitionDescriptor& partition_descriptor,
|
| scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
|
| - protocol_handler_interceptor);
|
| + 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);
|
|
|
| // Create an instance for an original profile for media with isolated
|
| // storage. This is expected to get called on UI thread.
|
| @@ -129,7 +150,18 @@ class ChromeURLRequestContextGetter : public net::URLRequestContextGetter {
|
| // Create an instance for use with an OTR profile. This is expected to get
|
| // called on the UI thread.
|
| static ChromeURLRequestContextGetter* CreateOffTheRecord(
|
| - Profile* profile, const ProfileIOData* profile_io_data);
|
| + 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);
|
|
|
| // Create an instance for an OTR profile for extensions. This is expected
|
| // to get called on UI thread.
|
| @@ -143,7 +175,17 @@ class ChromeURLRequestContextGetter : public net::URLRequestContextGetter {
|
| const ProfileIOData* profile_io_data,
|
| const StoragePartitionDescriptor& partition_descriptor,
|
| scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
|
| - protocol_handler_interceptor);
|
| + 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);
|
|
|
| private:
|
| virtual ~ChromeURLRequestContextGetter();
|
|
|