| Index: android_webview/browser/net/aw_request_interceptor.cc
|
| diff --git a/android_webview/browser/net/aw_request_interceptor.cc b/android_webview/browser/net/aw_request_interceptor.cc
|
| index 3cd5700c8a4f13175f671f40d521bb7af24e2f90..30ae888793ad4ec98ef57a42f7d7d574c6055586 100644
|
| --- a/android_webview/browser/net/aw_request_interceptor.cc
|
| +++ b/android_webview/browser/net/aw_request_interceptor.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "android_webview/browser/net/aw_request_interceptor.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "android_webview/browser/aw_contents_io_thread_client.h"
|
| #include "android_webview/browser/input_stream.h"
|
| #include "android_webview/browser/net/android_stream_reader_url_request_job.h"
|
| @@ -27,13 +29,13 @@ class StreamReaderJobDelegateImpl
|
| public:
|
| StreamReaderJobDelegateImpl(
|
| scoped_ptr<AwWebResourceResponse> aw_web_resource_response)
|
| - : aw_web_resource_response_(aw_web_resource_response.Pass()) {
|
| + : aw_web_resource_response_(std::move(aw_web_resource_response)) {
|
| DCHECK(aw_web_resource_response_);
|
| }
|
|
|
| scoped_ptr<InputStream> OpenInputStream(JNIEnv* env,
|
| const GURL& url) override {
|
| - return aw_web_resource_response_->GetInputStream(env).Pass();
|
| + return aw_web_resource_response_->GetInputStream(env);
|
| }
|
|
|
| void OnInputStreamOpenFailed(net::URLRequest* request,
|
| @@ -79,7 +81,7 @@ class ShouldInterceptRequestAdaptor
|
| public:
|
| explicit ShouldInterceptRequestAdaptor(
|
| scoped_ptr<AwContentsIoThreadClient> io_thread_client)
|
| - : io_thread_client_(io_thread_client.Pass()), weak_factory_(this) {}
|
| + : io_thread_client_(std::move(io_thread_client)), weak_factory_(this) {}
|
| ~ShouldInterceptRequestAdaptor() override {}
|
|
|
| void ObtainDelegate(net::URLRequest* request,
|
| @@ -98,8 +100,8 @@ class ShouldInterceptRequestAdaptor
|
| void WebResourceResponseObtained(
|
| scoped_ptr<AwWebResourceResponse> response) {
|
| if (response) {
|
| - callback_.Run(
|
| - make_scoped_ptr(new StreamReaderJobDelegateImpl(response.Pass())));
|
| + callback_.Run(make_scoped_ptr(
|
| + new StreamReaderJobDelegateImpl(std::move(response))));
|
| } else {
|
| callback_.Run(nullptr);
|
| }
|
| @@ -150,7 +152,7 @@ net::URLRequestJob* AwRequestInterceptor::MaybeInterceptRequest(
|
| return new AndroidStreamReaderURLRequestJob(
|
| request, network_delegate,
|
| make_scoped_ptr(
|
| - new ShouldInterceptRequestAdaptor(io_thread_client.Pass())),
|
| + new ShouldInterceptRequestAdaptor(std::move(io_thread_client))),
|
| true);
|
| }
|
|
|
|
|