| Index: content/shell/shell_browser_context.h
|
| diff --git a/content/shell/shell_browser_context.h b/content/shell/shell_browser_context.h
|
| index fa61e663a1c868536e89edb511431f82b3ee0575..9146499c9f877fac9d3b131f271d2a63a1d607c1 100644
|
| --- a/content/shell/shell_browser_context.h
|
| +++ b/content/shell/shell_browser_context.h
|
| @@ -10,6 +10,7 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/public/browser/browser_context.h"
|
| +#include "content/public/browser/content_browser_client.h"
|
| #include "net/url_request/url_request_job_factory.h"
|
|
|
| namespace content {
|
| @@ -46,29 +47,11 @@ class ShellBrowserContext : public BrowserContext {
|
| 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::ProtocolHandler>
|
| - developer_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_devtools_protocol_handler);
|
| + ProtocolHandlerMap* protocol_handlers);
|
| net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
|
| 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);
|
| + ProtocolHandlerMap* protocol_handlers);
|
|
|
| private:
|
| class ShellResourceContext;
|
|
|