| Index: android_webview/browser/net/aw_url_request_job_factory.h
|
| diff --git a/android_webview/browser/net/aw_url_request_job_factory.h b/android_webview/browser/net/aw_url_request_job_factory.h
|
| index 336cf188472cd98542e4e092ec73ecc7a0a2e8a5..81850bad8e6ebdcf1d8aa0b72071c6338c095a43 100644
|
| --- a/android_webview/browser/net/aw_url_request_job_factory.h
|
| +++ b/android_webview/browser/net/aw_url_request_job_factory.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_JOB_FACTORY_H_
|
| #define ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_JOB_FACTORY_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "net/url_request/url_request_job_factory.h"
|
|
|
| namespace net {
|
| @@ -27,7 +28,7 @@ class AwURLRequestJobFactory : public net::URLRequestJobFactory {
|
| ~AwURLRequestJobFactory() override;
|
|
|
| bool SetProtocolHandler(const std::string& scheme,
|
| - scoped_ptr<ProtocolHandler> protocol_handler);
|
| + std::unique_ptr<ProtocolHandler> protocol_handler);
|
|
|
| // net::URLRequestJobFactory implementation.
|
| net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
|
| @@ -51,7 +52,7 @@ class AwURLRequestJobFactory : public net::URLRequestJobFactory {
|
| private:
|
| // By default calls are forwarded to this factory, to avoid having to
|
| // subclass an existing implementation class.
|
| - scoped_ptr<net::URLRequestJobFactoryImpl> next_factory_;
|
| + std::unique_ptr<net::URLRequestJobFactoryImpl> next_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AwURLRequestJobFactory);
|
| };
|
|
|