Index: remoting/client/software_video_renderer_unittest.cc |
diff --git a/remoting/client/software_video_renderer_unittest.cc b/remoting/client/software_video_renderer_unittest.cc |
index 9a36d72a554c430a06aa32401fed6146d5dd8fb3..d57e7b9124cab44515689eef041ea89e822c021c 100644 |
--- a/remoting/client/software_video_renderer_unittest.cc |
+++ b/remoting/client/software_video_renderer_unittest.cc |
@@ -6,6 +6,7 @@ |
#include <stdint.h> |
+#include <utility> |
#include <vector> |
#include "base/bind.h" |
@@ -34,15 +35,14 @@ class TestFrameConsumer : public FrameConsumer { |
TestFrameConsumer() {} |
~TestFrameConsumer() override {} |
- scoped_ptr<DesktopFrame> WaitForNextFrame( |
- base::Closure* out_done_callback) { |
+ scoped_ptr<DesktopFrame> WaitForNextFrame(base::Closure* out_done_callback) { |
EXPECT_TRUE(thread_checker_.CalledOnValidThread()); |
frame_run_loop_.reset(new base::RunLoop()); |
frame_run_loop_->Run(); |
frame_run_loop_.reset(); |
*out_done_callback = last_frame_done_callback_; |
last_frame_done_callback_.Reset(); |
- return last_frame_.Pass(); |
+ return std::move(last_frame_); |
} |
// FrameConsumer interface. |
@@ -55,7 +55,7 @@ class TestFrameConsumer : public FrameConsumer { |
void DrawFrame(scoped_ptr<DesktopFrame> frame, |
const base::Closure& done) override { |
EXPECT_TRUE(thread_checker_.CalledOnValidThread()); |
- last_frame_ = frame.Pass(); |
+ last_frame_ = std::move(frame); |
last_frame_done_callback_ = done; |
frame_run_loop_->Quit(); |
} |
@@ -97,7 +97,7 @@ scoped_ptr<DesktopFrame> CreateTestFrame(int index) { |
webrtc::DesktopRect::MakeWH(index, index)); |
} |
- return frame.Pass(); |
+ return frame; |
} |
// Returns true when frames a and b are equivalent. |