| Index: content/shell/shell_url_request_context_getter.h
|
| diff --git a/content/shell/shell_url_request_context_getter.h b/content/shell/shell_url_request_context_getter.h
|
| index 23f79d16807337f4c904a8d691cf5ecc838d24c4..528e2b4cf3bf95c92b734255328473d079261e9e 100644
|
| --- a/content/shell/shell_url_request_context_getter.h
|
| +++ b/content/shell/shell_url_request_context_getter.h
|
| @@ -32,15 +32,8 @@ class ShellURLRequestContextGetter : public net::URLRequestContextGetter {
|
| MessageLoop* io_loop,
|
| MessageLoop* file_loop,
|
| 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);
|
|
|
| // net::URLRequestContextGetter implementation.
|
| virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
|
| @@ -63,15 +56,8 @@ class ShellURLRequestContextGetter : public net::URLRequestContextGetter {
|
| scoped_ptr<net::URLRequestContextStorage> storage_;
|
| scoped_ptr<net::URLRequestContext> url_request_context_;
|
| 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::ProtocolHandlers protocol_handlers_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellURLRequestContextGetter);
|
| };
|
|
|