Use std::move() instead of scoped_ptr<>::Pass().

remoting/protocol/video_frame_pump_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 "remoting/protocol/video_frame_pump.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 157 matching lines @@
 
   base::RunLoop run_loop;
 
   // When the first ProcessVideoPacket is received we stop the VideoFramePump.
   EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
       .WillOnce(DoAll(FinishSend(),
                       InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit)))
       .RetiresOnSaturation();
 
   // Start video frame capture.
-  pump_.reset(new VideoFramePump(encode_task_runner_, capturer.Pass(),
-                                 encoder.Pass(), &video_stub_));
+  pump_.reset(new VideoFramePump(encode_task_runner_, std::move(capturer),
+                                 std::move(encoder), &video_stub_));
 
   // Run MessageLoop until the first frame is received.
   run_loop.Run();
 }
 
 // Tests that the pump handles null frames returned by the capturer.
 TEST_F(VideoFramePumpTest, NullFrame) {
   scoped_ptr<FakeDesktopCapturer> capturer(new FakeDesktopCapturer);
   scoped_ptr<MockVideoEncoder> encoder(new MockVideoEncoder);
 
   base::RunLoop run_loop;
 
   // Set up the capturer to return null frames.
   capturer->set_frame_generator(base::Bind(&CreateNullFrame));
 
   // Expect that the VideoEncoder::Encode() method is never called.
   EXPECT_CALL(*encoder, EncodePtr(_)).Times(0);
 
   // When the first ProcessVideoPacket is received we stop the VideoFramePump.
   EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
       .WillOnce(DoAll(FinishSend(),
                       InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit)))
       .RetiresOnSaturation();
 
   // Start video frame capture.
-  pump_.reset(new VideoFramePump(encode_task_runner_, capturer.Pass(),
-                                 encoder.Pass(), &video_stub_));
+  pump_.reset(new VideoFramePump(encode_task_runner_, std::move(capturer),
+                                 std::move(encoder), &video_stub_));
 
   // Run MessageLoop until the first frame is received..
   run_loop.Run();
 }
 
 // Tests how the pump handles unchanged frames returned by the capturer.
 TEST_F(VideoFramePumpTest, UnchangedFrame) {
   scoped_ptr<FakeDesktopCapturer> capturer(new FakeDesktopCapturer);
   scoped_ptr<MockVideoEncoder> encoder(new MockVideoEncoder);
 
   base::RunLoop run_loop;
 
   // Set up the capturer to return unchanged frames.
   capturer->set_frame_generator(base::Bind(&CreateUnchangedFrame));
 
   // Expect that the VideoEncoder::Encode() method is called.
   EXPECT_CALL(*encoder, EncodePtr(_)).WillRepeatedly(Return(nullptr));
 
   // When the first ProcessVideoPacket is received we stop the VideoFramePump.
   // TODO(wez): Verify that the generated packet has no content here.
   EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _))
       .WillOnce(DoAll(FinishSend(),
                       InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit)))
       .RetiresOnSaturation();
 
   // Start video frame capture.
-  pump_.reset(new VideoFramePump(encode_task_runner_, capturer.Pass(),
-                                 encoder.Pass(), &video_stub_));
+  pump_.reset(new VideoFramePump(encode_task_runner_, std::move(capturer),
+                                 std::move(encoder), &video_stub_));
 
   // Run MessageLoop until the first frame is received.
   run_loop.Run();
 }
 
 }  // namespace protocol
 }  // namespace remoting