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

android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc

Index: android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
index 50b0cc45b94927cfa46170e94f668067f7ecc858..ea272b99638092f8d30f2ba9df87a6d8dae6a024 100644
--- a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
+++ b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
@@ -2,8 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "android_webview/browser/input_stream.h"
 #include "android_webview/browser/net/android_stream_reader_url_request_job.h"
+
+#include <utility>
+
+#include "android_webview/browser/input_stream.h"
 #include "android_webview/browser/net/aw_url_request_job_factory.h"
 #include "android_webview/browser/net/input_stream_reader.h"
 #include "base/format_macros.h"
@@ -18,7 +21,6 @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_test_util.h"
-
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -154,15 +156,14 @@ class MockInputStreamReader : public InputStreamReader {
 
 class TestStreamReaderJob : public AndroidStreamReaderURLRequestJob {
  public:
-  TestStreamReaderJob(
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate,
-      scoped_ptr<Delegate> delegate,
-      scoped_ptr<InputStreamReader> stream_reader)
+  TestStreamReaderJob(net::URLRequest* request,
+                      net::NetworkDelegate* network_delegate,
+                      scoped_ptr<Delegate> delegate,
+                      scoped_ptr<InputStreamReader> stream_reader)
       : AndroidStreamReaderURLRequestJob(request,
                                          network_delegate,
-                                         delegate.Pass()),
-        stream_reader_(stream_reader.Pass()) {
+                                         std::move(delegate)),
+        stream_reader_(std::move(stream_reader)) {
     task_runner_ = base::ThreadTaskRunnerHandle::Get();
   }
 
@@ -170,7 +171,7 @@ class TestStreamReaderJob : public AndroidStreamReaderURLRequestJob {
 
   scoped_ptr<InputStreamReader> CreateStreamReader(
       InputStream* stream) override {
-    return stream_reader_.Pass();
+    return std::move(stream_reader_);
   }
 
  protected:
@@ -208,7 +209,7 @@ class AndroidStreamReaderURLRequestJobTest : public Test {
   }
 
   void SetUpTestJob(scoped_ptr<InputStreamReader> stream_reader) {
-    SetUpTestJob(stream_reader.Pass(),
+    SetUpTestJob(std::move(stream_reader),
                  make_scoped_ptr(new StreamReaderDelegate()));
   }
 
@@ -217,8 +218,8 @@ class AndroidStreamReaderURLRequestJobTest : public Test {
                         stream_reader_delegate) {
     scoped_ptr<TestStreamReaderJob> test_stream_reader_job(
         new TestStreamReaderJob(req_.get(), &network_delegate_,
-                                stream_reader_delegate.Pass(),
-                                stream_reader.Pass()));
+                                std::move(stream_reader_delegate),
+                                std::move(stream_reader)));
     // The Interceptor is owned by the |factory_|.
     scoped_ptr<TestJobInterceptor> protocol_handler(new TestJobInterceptor);
     protocol_handler->set_main_intercept_job(std::move(test_stream_reader_job));
@@ -246,7 +247,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, ReadEmptyStream) {
         .WillOnce(Return(0));
   }
 
-  SetUpTestJob(stream_reader.Pass());
+  SetUpTestJob(std::move(stream_reader));
 
   req_->Start();
 
@@ -321,7 +322,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, ReadPartOfStream) {
         .WillOnce(Return(0));
   }
 
-  SetUpTestJob(stream_reader.Pass());
+  SetUpTestJob(std::move(stream_reader));
 
   SetRange(req_.get(), offset, bytes_available);
   req_->Start();
@@ -352,7 +353,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest,
         .WillOnce(Return(0));
   }
 
-  SetUpTestJob(stream_reader.Pass());
+  SetUpTestJob(std::move(stream_reader));
 
   SetRange(req_.get(), offset, bytes_available_reported);
   req_->Start();
@@ -377,7 +378,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, DeleteJobMidWaySeek) {
   ON_CALL(*stream_reader, ReadRawData(_, _))
       .WillByDefault(Return(0));
 
-  SetUpTestJob(stream_reader.Pass());
+  SetUpTestJob(std::move(stream_reader));
 
   SetRange(req_.get(), offset, bytes_available);
   req_->Start();
@@ -402,7 +403,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, DeleteJobMidWayRead) {
       .WillOnce(DoAll(InvokeWithoutArgs(&loop, &base::RunLoop::Quit),
                       Return(bytes_available)));
 
-  SetUpTestJob(stream_reader.Pass());
+  SetUpTestJob(std::move(stream_reader));
 
   SetRange(req_.get(), offset, bytes_available);
   req_->Start();