| Index: remoting/base/url_request_context_getter.h
|
| diff --git a/remoting/base/url_request_context_getter.h b/remoting/base/url_request_context_getter.h
|
| index 13ef14707f40dc66804cabef47eece27ae922984..d6c9916303b784aec2ca245cf86779e60244612e 100644
|
| --- a/remoting/base/url_request_context_getter.h
|
| +++ b/remoting/base/url_request_context_getter.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef REMOTING_BASE_URL_REQUEST_CONTEXT_GETTER_H_
|
| #define REMOTING_BASE_URL_REQUEST_CONTEXT_GETTER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
|
|
| namespace base {
|
| @@ -37,9 +38,9 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
|
| private:
|
| scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
|
| scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
|
| - scoped_ptr<net::ProxyConfigService> proxy_config_service_;
|
| - scoped_ptr<net::NetLog> net_log_;
|
| - scoped_ptr<net::URLRequestContext> url_request_context_;
|
| + std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
|
| + std::unique_ptr<net::NetLog> net_log_;
|
| + std::unique_ptr<net::URLRequestContext> url_request_context_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(URLRequestContextGetter);
|
| };
|
|
|