Index: content/shell/shell_browser_context.h |
diff --git a/content/shell/shell_browser_context.h b/content/shell/shell_browser_context.h |
index f58132e42339be2fd8ba0a07fca871a56c9dac7b..3f790332f93bcb1a923979eb7a626291dff6dfdf 100644 |
--- a/content/shell/shell_browser_context.h |
+++ b/content/shell/shell_browser_context.h |
@@ -10,12 +10,14 @@ |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
#include "content/public/browser/browser_context.h" |
+#include "net/url_request/url_request_job_factory.h" |
namespace content { |
class DownloadManagerDelegate; |
class ResourceContext; |
class ShellDownloadManagerDelegate; |
+class ShellURLRequestContextGetter; |
class ShellBrowserContext : public BrowserContext { |
public: |
@@ -36,9 +38,6 @@ class ShellBrowserContext : public BrowserContext { |
GetMediaRequestContextForStoragePartition( |
const FilePath& partition_path, |
bool in_memory) OVERRIDE; |
- virtual net::URLRequestContextGetter* GetRequestContextForStoragePartition( |
- const FilePath& partition_path, |
- bool in_memory) OVERRIDE; |
virtual ResourceContext* GetResourceContext() OVERRIDE; |
virtual GeolocationPermissionContext* |
GetGeolocationPermissionContext() OVERRIDE; |
@@ -46,7 +45,26 @@ class ShellBrowserContext : public BrowserContext { |
GetSpeechRecognitionPreferences() OVERRIDE; |
virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE; |
+ net::URLRequestContextGetter* CreateRequestContext( |
+ 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); |
+ net::URLRequestContextGetter* CreateRequestContextForStoragePartition( |
+ const 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::Interceptor> |
+ developer_protocol_handler); |
+ |
private: |
+ class ShellResourceContext; |
+ |
// Performs initialization of the ShellBrowserContext while IO is still |
// allowed on the current thread. |
void InitWhileIOAllowed(); |
@@ -54,9 +72,9 @@ class ShellBrowserContext : public BrowserContext { |
bool off_the_record_; |
bool ignore_certificate_errors_; |
FilePath path_; |
- scoped_ptr<ResourceContext> resource_context_; |
+ scoped_ptr<ShellResourceContext> resource_context_; |
scoped_refptr<ShellDownloadManagerDelegate> download_manager_delegate_; |
- scoped_refptr<net::URLRequestContextGetter> url_request_getter_; |
+ scoped_refptr<ShellURLRequestContextGetter> url_request_getter_; |
DISALLOW_COPY_AND_ASSIGN(ShellBrowserContext); |
}; |