Convert Pass()→std::move() in //android_webview

android_webview/browser/net/aw_request_interceptor.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "android_webview/browser/net/aw_web_resource_response.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/supports_user_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_request_info.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_job.h"
 
 namespace android_webview {
 
 namespace {
 
 const void* const kRequestAlreadyHasJobDataKey = &kRequestAlreadyHasJobDataKey;
 
 class StreamReaderJobDelegateImpl
     : public AndroidStreamReaderURLRequestJob::Delegate {
  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,
                                bool* restart) override {
     *restart = false;
   }
 
   bool GetMimeType(JNIEnv* env,
                    net::URLRequest* request,
                    android_webview::InputStream* stream,
@@ skipping 25 matching lines @@
 
  private:
   scoped_ptr<AwWebResourceResponse> aw_web_resource_response_;
 };
 
 class ShouldInterceptRequestAdaptor
     : public AndroidStreamReaderURLRequestJob::DelegateObtainer {
  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,
                       const Callback& callback) override {
     callback_ = callback;
     io_thread_client_->ShouldInterceptRequestAsync(
         // The request is only used while preparing the call, not retained.
         request,
         base::Bind(&ShouldInterceptRequestAdaptor::WebResourceResponseObtained,
                    // The lifetime of the DelegateObtainer is managed by
                    // AndroidStreamReaderURLRequestJob, it might get deleted.
                    weak_factory_.GetWeakPtr()));
   }
 
  private:
   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);
     }
   }
 
   scoped_ptr<AwContentsIoThreadClient> io_thread_client_;
   Callback callback_;
   base::WeakPtrFactory<ShouldInterceptRequestAdaptor> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ShouldInterceptRequestAdaptor);
@@ skipping 30 matching lines @@
   if (referrer.is_valid() &&
       (!request->is_pending() || request->is_redirecting())) {
     request->SetExtraRequestHeaderByName(net::HttpRequestHeaders::kReferer,
                                          referrer.spec(), true);
   }
   request->SetUserData(kRequestAlreadyHasJobDataKey,
                        new base::SupportsUserData::Data());
   return new AndroidStreamReaderURLRequestJob(
       request, network_delegate,
       make_scoped_ptr(
-          new ShouldInterceptRequestAdaptor(io_thread_client.Pass())),
+          new ShouldInterceptRequestAdaptor(std::move(io_thread_client))),
       true);
 }
 
 }  // namespace android_webview