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

android_webview/browser/net/android_stream_reader_url_request_job.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/android_stream_reader_url_request_job.h"
 
 #include <string>
+#include <utility>
 
 #include "android_webview/browser/input_stream.h"
 #include "android_webview/browser/net/input_stream_reader.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 29 matching lines @@
 
 } // namespace
 
 // The requests posted to the worker thread might outlive the job.  Thread-safe
 // ref counting is used to ensure that the InputStream and InputStreamReader
 // members of this class are still there when the closure is run on the worker
 // thread.
 class InputStreamReaderWrapper :
     public base::RefCountedThreadSafe<InputStreamReaderWrapper> {
  public:
-  InputStreamReaderWrapper(
-      scoped_ptr<InputStream> input_stream,
-      scoped_ptr<InputStreamReader> input_stream_reader)
-      : input_stream_(input_stream.Pass()),
-        input_stream_reader_(input_stream_reader.Pass()) {
+  InputStreamReaderWrapper(scoped_ptr<InputStream> input_stream,
+                           scoped_ptr<InputStreamReader> input_stream_reader)
+      : input_stream_(std::move(input_stream)),
+        input_stream_reader_(std::move(input_stream_reader)) {
     DCHECK(input_stream_);
     DCHECK(input_stream_reader_);
   }
 
   InputStream* input_stream() {
     return input_stream_.get();
   }
 
   int Seek(const net::HttpByteRange& byte_range) {
     return input_stream_reader_->Seek(byte_range);
@@ skipping 12 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(InputStreamReaderWrapper);
 };
 
 AndroidStreamReaderURLRequestJob::AndroidStreamReaderURLRequestJob(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate,
     scoped_ptr<Delegate> delegate)
     : URLRequestJob(request, network_delegate),
       range_parse_result_(net::OK),
-      delegate_(delegate.Pass()),
+      delegate_(std::move(delegate)),
       weak_factory_(this) {
   DCHECK(delegate_);
 }
 
 AndroidStreamReaderURLRequestJob::AndroidStreamReaderURLRequestJob(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate,
     scoped_ptr<DelegateObtainer> delegate_obtainer,
     bool)
     : URLRequestJob(request, network_delegate),
       range_parse_result_(net::OK),
-      delegate_obtainer_(delegate_obtainer.Pass()),
+      delegate_obtainer_(std::move(delegate_obtainer)),
       weak_factory_(this) {
   DCHECK(delegate_obtainer_);
 }
 
 AndroidStreamReaderURLRequestJob::~AndroidStreamReaderURLRequestJob() {
 }
 
 namespace {
 
 typedef base::Callback<
     void(scoped_ptr<AndroidStreamReaderURLRequestJob::Delegate>,
          scoped_ptr<InputStream>)> OnInputStreamOpenedCallback;
 
 // static
 void OpenInputStreamOnWorkerThread(
     scoped_refptr<base::SingleThreadTaskRunner> job_thread_task_runner,
     scoped_ptr<AndroidStreamReaderURLRequestJob::Delegate> delegate,
     const GURL& url,
     OnInputStreamOpenedCallback callback) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
 
   scoped_ptr<InputStream> input_stream = delegate->OpenInputStream(env, url);
   job_thread_task_runner->PostTask(
-      FROM_HERE, base::Bind(callback, base::Passed(delegate.Pass()),
-                            base::Passed(input_stream.Pass())));
+      FROM_HERE, base::Bind(callback, base::Passed(std::move(delegate)),
+                            base::Passed(std::move(input_stream))));
 }
 
 } // namespace
 
 void AndroidStreamReaderURLRequestJob::Start() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!delegate_) {
     DCHECK(delegate_obtainer_);
     delegate_obtainer_->ObtainDelegate(
         request(),
@@ skipping 16 matching lines @@
 scoped_ptr<InputStreamReader>
 AndroidStreamReaderURLRequestJob::CreateStreamReader(InputStream* stream) {
   return make_scoped_ptr(new InputStreamReader(stream));
 }
 
 void AndroidStreamReaderURLRequestJob::OnInputStreamOpened(
       scoped_ptr<Delegate> returned_delegate,
       scoped_ptr<android_webview::InputStream> input_stream) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(returned_delegate);
-  delegate_ = returned_delegate.Pass();
+  delegate_ = std::move(returned_delegate);
 
   if (!input_stream) {
     bool restart_required = false;
     delegate_->OnInputStreamOpenFailed(request(), &restart_required);
     if (restart_required) {
       NotifyRestartRequired();
     } else {
       // Clear the IO_PENDING status set in Start().
       SetStatus(net::URLRequestStatus());
       HeadersComplete(kHTTPNotFound, kHTTPNotFoundText);
     }
     return;
   }
 
   scoped_ptr<InputStreamReader> input_stream_reader(
       CreateStreamReader(input_stream.get()));
   DCHECK(input_stream_reader);
 
   DCHECK(!input_stream_reader_wrapper_.get());
   input_stream_reader_wrapper_ = new InputStreamReaderWrapper(
-      input_stream.Pass(), input_stream_reader.Pass());
+      std::move(input_stream), std::move(input_stream_reader));
 
   PostTaskAndReplyWithResult(
       GetWorkerThreadRunner(),
       FROM_HERE,
       base::Bind(&InputStreamReaderWrapper::Seek,
                  input_stream_reader_wrapper_,
                  byte_range_),
       base::Bind(&AndroidStreamReaderURLRequestJob::OnReaderSeekCompleted,
                  weak_factory_.GetWeakPtr()));
 }
@@ skipping 184 matching lines @@
         byte_range_ = ranges[0];
     } else {
       // We don't support multiple range requests in one single URL request,
       // because we need to do multipart encoding here.
       range_parse_result_ = net::ERR_REQUEST_RANGE_NOT_SATISFIABLE;
     }
   }
 }
 
 }  // namespace android_webview