| Index: content/shell/browser/shell_url_request_context_getter.h
|
| diff --git a/content/shell/browser/shell_url_request_context_getter.h b/content/shell/browser/shell_url_request_context_getter.h
|
| index 3c2a7cdd19de310b26bc03d2d20850cda5b3d91a..b6ea149ed075d3e64300c80a510be27733690837 100644
|
| --- a/content/shell/browser/shell_url_request_context_getter.h
|
| +++ b/content/shell/browser/shell_url_request_context_getter.h
|
| @@ -5,11 +5,12 @@
|
| #ifndef CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_
|
| #define CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/compiler_specific.h"
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/public/browser/browser_context.h"
|
| #include "net/proxy/proxy_config_service.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| @@ -54,9 +55,9 @@ class ShellURLRequestContextGetter : public net::URLRequestContextGetter {
|
|
|
| // Used by subclasses to create their own implementation of NetworkDelegate
|
| // and net::ProxyService.
|
| - virtual scoped_ptr<net::NetworkDelegate> CreateNetworkDelegate();
|
| - virtual scoped_ptr<net::ProxyConfigService> GetProxyConfigService();
|
| - virtual scoped_ptr<net::ProxyService> GetProxyService();
|
| + virtual std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate();
|
| + virtual std::unique_ptr<net::ProxyConfigService> GetProxyConfigService();
|
| + virtual std::unique_ptr<net::ProxyService> GetProxyService();
|
|
|
| private:
|
| bool ignore_certificate_errors_;
|
| @@ -65,10 +66,10 @@ class ShellURLRequestContextGetter : public net::URLRequestContextGetter {
|
| scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
|
| net::NetLog* net_log_;
|
|
|
| - scoped_ptr<net::ProxyConfigService> proxy_config_service_;
|
| - scoped_ptr<net::NetworkDelegate> network_delegate_;
|
| - scoped_ptr<net::URLRequestContextStorage> storage_;
|
| - scoped_ptr<net::URLRequestContext> url_request_context_;
|
| + std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
|
| + std::unique_ptr<net::NetworkDelegate> network_delegate_;
|
| + std::unique_ptr<net::URLRequestContextStorage> storage_;
|
| + std::unique_ptr<net::URLRequestContext> url_request_context_;
|
| ProtocolHandlerMap protocol_handlers_;
|
| URLRequestInterceptorScopedVector request_interceptors_;
|
|
|
|
|