Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(330)

Unified Diff: media/cast/sender/video_encoder_unittest.cc

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/sender/size_adaptable_video_encoder_base.cc ('k') | media/cast/sender/video_sender.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/sender/video_encoder_unittest.cc
diff --git a/media/cast/sender/video_encoder_unittest.cc b/media/cast/sender/video_encoder_unittest.cc
index 487c14078813312a625797935436aed4f2c52021..9624e43f3e28b31dc43aad15bc89907e127fda84 100644
--- a/media/cast/sender/video_encoder_unittest.cc
+++ b/media/cast/sender/video_encoder_unittest.cc
@@ -36,11 +36,11 @@ class VideoEncoderTest
VideoEncoderTest()
: testing_clock_(new base::SimpleTestTickClock()),
task_runner_(new test::FakeSingleThreadTaskRunner(testing_clock_)),
- cast_environment_(new CastEnvironment(
- scoped_ptr<base::TickClock>(testing_clock_).Pass(),
- task_runner_,
- task_runner_,
- task_runner_)),
+ cast_environment_(
+ new CastEnvironment(scoped_ptr<base::TickClock>(testing_clock_),
+ task_runner_,
+ task_runner_,
+ task_runner_)),
video_config_(GetDefaultVideoSenderConfig()),
operational_status_(STATUS_UNINITIALIZED),
count_frames_delivered_(0) {
@@ -67,15 +67,14 @@ class VideoEncoderTest
ASSERT_EQ(STATUS_UNINITIALIZED, operational_status_);
video_config_.max_number_of_video_buffers_used = 1;
video_encoder_ = VideoEncoder::Create(
- cast_environment_,
- video_config_,
+ cast_environment_, video_config_,
base::Bind(&VideoEncoderTest::OnOperationalStatusChange,
base::Unretained(this)),
base::Bind(
&FakeVideoEncodeAcceleratorFactory::CreateVideoEncodeAccelerator,
base::Unretained(vea_factory_.get())),
base::Bind(&FakeVideoEncodeAcceleratorFactory::CreateSharedMemory,
- base::Unretained(vea_factory_.get()))).Pass();
+ base::Unretained(vea_factory_.get())));
RunTasksAndAdvanceClock();
if (is_encoder_present())
ASSERT_EQ(STATUS_INITIALIZED, operational_status_);
@@ -212,7 +211,7 @@ class VideoEncoderTest
// Create the VideoFrameFactory the first time status changes to
// STATUS_INITIALIZED.
if (operational_status_ == STATUS_INITIALIZED && !video_frame_factory_)
- video_frame_factory_ = video_encoder_->CreateVideoFrameFactory().Pass();
+ video_frame_factory_ = video_encoder_->CreateVideoFrameFactory();
}
// Checks that |encoded_frame| matches expected values. This is the method
« no previous file with comments | « media/cast/sender/size_adaptable_video_encoder_base.cc ('k') | media/cast/sender/video_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698