Convert Pass()→std::move() in //media (Android Cast edition)

media/base/android/media_codec_decoder_unittest.cc

 // Copyright 2015 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 <utility>
+
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/timer/timer.h"
 #include "media/base/android/media_codec_audio_decoder.h"
 #include "media/base/android/media_codec_util.h"
 #include "media/base/android/media_codec_video_decoder.h"
 #include "media/base/android/media_statistics.h"
 #include "media/base/android/sdk_media_codec_bridge.h"
@@ skipping 134 matching lines @@
   typedef base::Callback<bool()> Predicate;
 
   typedef base::Callback<void(const DemuxerData&)> DataAvailableCallback;
 
   // Waits for condition to become true or for timeout to expire.
   // Returns true if the condition becomes true.
   bool WaitForCondition(const Predicate& condition,
                         const base::TimeDelta& timeout = kDefaultTimeout);
 
   void SetDataFactory(scoped_ptr<TestDataFactory> factory) {
-    data_factory_ = factory.Pass();
+    data_factory_ = std::move(factory);
   }
 
   DemuxerConfigs GetConfigs() const {
     // ASSERT_NE does not compile here because it expects void return value.
     EXPECT_NE(nullptr, data_factory_.get());
     return data_factory_->GetConfigs();
   }
 
   void CreateAudioDecoder();
   void CreateVideoDecoder();
@@ skipping 143 matching lines @@
   task_runner_->PostDelayedTask(FROM_HERE, base::Bind(data_available_cb_, data),
                                 delay);
 }
 
 void MediaCodecDecoderTest::SetVideoSurface() {
   surface_texture_ = gfx::SurfaceTexture::Create(0);
   gfx::ScopedJavaSurface surface(surface_texture_.get());
   ASSERT_NE(nullptr, decoder_.get());
   MediaCodecVideoDecoder* video_decoder =
       static_cast<MediaCodecVideoDecoder*>(decoder_.get());
-  video_decoder->SetVideoSurface(surface.Pass());
+  video_decoder->SetVideoSurface(std::move(surface));
 }
 
 TEST_F(MediaCodecDecoderTest, AudioPrefetch) {
   CreateAudioDecoder();
 
   base::TimeDelta duration = base::TimeDelta::FromMilliseconds(500);
   SetDataFactory(scoped_ptr<TestDataFactory>(new AudioFactory(duration)));
 
   decoder_->Prefetch(base::Bind(&MediaCodecDecoderTest::SetPrefetched,
                                 base::Unretained(this), true));
@@ skipping 105 matching lines @@
   // Prepare the surface.
   scoped_refptr<gfx::SurfaceTexture> surface_texture(
       gfx::SurfaceTexture::Create(0));
   gfx::ScopedJavaSurface surface(surface_texture.get());
 
   // Release the surface texture.
   surface_texture = NULL;
 
   MediaCodecVideoDecoder* video_decoder =
       static_cast<MediaCodecVideoDecoder*>(decoder_.get());
-  video_decoder->SetVideoSurface(surface.Pass());
+  video_decoder->SetVideoSurface(std::move(surface));
 
   EXPECT_EQ(MediaCodecDecoder::kConfigFailure, decoder_->Configure(nullptr));
 }
 
 TEST_F(MediaCodecDecoderTest, VideoConfigureValidParams) {
   SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
 
   CreateVideoDecoder();
 
   // decoder_->Configure() searches back for the key frame.
@@ skipping 290 matching lines @@
 
   EXPECT_TRUE(decoder_->IsStopped());
   EXPECT_TRUE(decoder_->IsCompleted());
   EXPECT_EQ(data_factory_->last_pts(), pts_stat_.max());
 
   // Check that the reported video size is the one from the in-stream configs.
   EXPECT_EQ(data_factory_->GetConfigs().video_size, video_size_);
 }
 
 }  // namespace media