Commit 6781624e authored by David Bienvenu's avatar David Bienvenu Committed by Commit Bot

Replace base::Closure with OnceClosure in media/filters

This completes the conversion of media/filters/*.

Bug: 1007805
Change-Id: I86c90287a612b055e780eb175ef7f162d87f420f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2532903Reviewed-by: default avatarChrome Cunningham <chcunningham@chromium.org>
Commit-Queue: David Bienvenu <davidbienvenu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827275}
parent 2c8e6208
...@@ -301,12 +301,12 @@ class AudioDecoderTest ...@@ -301,12 +301,12 @@ class AudioDecoderTest
decoded_audio_.push_back(std::move(buffer)); decoded_audio_.push_back(std::move(buffer));
} }
void DecodeFinished(const base::Closure& quit_closure, Status status) { void DecodeFinished(base::OnceClosure quit_closure, Status status) {
EXPECT_TRUE(pending_decode_); EXPECT_TRUE(pending_decode_);
EXPECT_FALSE(pending_reset_); EXPECT_FALSE(pending_reset_);
pending_decode_ = false; pending_decode_ = false;
last_decode_status_ = std::move(status); last_decode_status_ = std::move(status);
quit_closure.Run(); std::move(quit_closure).Run();
} }
void ResetFinished() { void ResetFinished() {
......
...@@ -4388,10 +4388,10 @@ TEST_F(ChunkDemuxerTest, ...@@ -4388,10 +4388,10 @@ TEST_F(ChunkDemuxerTest,
} }
namespace { namespace {
void QuitLoop(base::Closure quit_closure, void QuitLoop(base::OnceClosure quit_closure,
DemuxerStream::Type type, DemuxerStream::Type type,
const std::vector<DemuxerStream*>& streams) { const std::vector<DemuxerStream*>& streams) {
quit_closure.Run(); std::move(quit_closure).Run();
} }
void DisableAndEnableDemuxerTracks( void DisableAndEnableDemuxerTracks(
......
...@@ -45,10 +45,10 @@ class DemuxerHostImpl : public media::DemuxerHost { ...@@ -45,10 +45,10 @@ class DemuxerHostImpl : public media::DemuxerHost {
DISALLOW_COPY_AND_ASSIGN(DemuxerHostImpl); DISALLOW_COPY_AND_ASSIGN(DemuxerHostImpl);
}; };
static void QuitLoopWithStatus(base::Closure quit_cb, static void QuitLoopWithStatus(base::OnceClosure quit_cb,
media::PipelineStatus status) { media::PipelineStatus status) {
CHECK_EQ(status, media::PIPELINE_OK); CHECK_EQ(status, media::PIPELINE_OK);
quit_cb.Run(); std::move(quit_cb).Run();
} }
static void OnEncryptedMediaInitData(EmeInitDataType init_data_type, static void OnEncryptedMediaInitData(EmeInitDataType init_data_type,
...@@ -81,7 +81,7 @@ class StreamReader { ...@@ -81,7 +81,7 @@ class StreamReader {
private: private:
void OnReadDone(scoped_refptr<base::SingleThreadTaskRunner> task_runner, void OnReadDone(scoped_refptr<base::SingleThreadTaskRunner> task_runner,
const base::Closure& quit_when_idle_closure, base::OnceClosure quit_when_idle_closure,
bool* end_of_stream, bool* end_of_stream,
base::TimeDelta* timestamp, base::TimeDelta* timestamp,
media::DemuxerStream::Status status, media::DemuxerStream::Status status,
...@@ -139,7 +139,7 @@ bool StreamReader::IsDone() { ...@@ -139,7 +139,7 @@ bool StreamReader::IsDone() {
void StreamReader::OnReadDone( void StreamReader::OnReadDone(
scoped_refptr<base::SingleThreadTaskRunner> task_runner, scoped_refptr<base::SingleThreadTaskRunner> task_runner,
const base::Closure& quit_when_idle_closure, base::OnceClosure quit_when_idle_closure,
bool* end_of_stream, bool* end_of_stream,
base::TimeDelta* timestamp, base::TimeDelta* timestamp,
media::DemuxerStream::Status status, media::DemuxerStream::Status status,
...@@ -148,7 +148,7 @@ void StreamReader::OnReadDone( ...@@ -148,7 +148,7 @@ void StreamReader::OnReadDone(
CHECK(buffer); CHECK(buffer);
*end_of_stream = buffer->end_of_stream(); *end_of_stream = buffer->end_of_stream();
*timestamp = *end_of_stream ? media::kNoTimestamp : buffer->timestamp(); *timestamp = *end_of_stream ? media::kNoTimestamp : buffer->timestamp();
task_runner->PostTask(FROM_HERE, quit_when_idle_closure); task_runner->PostTask(FROM_HERE, std::move(quit_when_idle_closure));
} }
int StreamReader::GetNextStreamIndexToRead() { int StreamReader::GetNextStreamIndexToRead() {
......
...@@ -1653,10 +1653,10 @@ TEST_F(FFmpegDemuxerTest, Seek_FallbackToDisabledAudioStream) { ...@@ -1653,10 +1653,10 @@ TEST_F(FFmpegDemuxerTest, Seek_FallbackToDisabledAudioStream) {
} }
namespace { namespace {
void QuitLoop(base::Closure quit_closure, void QuitLoop(base::OnceClosure quit_closure,
DemuxerStream::Type type, DemuxerStream::Type type,
const std::vector<DemuxerStream*>& streams) { const std::vector<DemuxerStream*>& streams) {
quit_closure.Run(); std::move(quit_closure).Run();
} }
void DisableAndEnableDemuxerTracks( void DisableAndEnableDemuxerTracks(
......
...@@ -134,7 +134,7 @@ class OutputMailbox { ...@@ -134,7 +134,7 @@ class OutputMailbox {
// The mailbox is referenced by a VideoFrame. It will be deleted as soon // The mailbox is referenced by a VideoFrame. It will be deleted as soon
// as the frame is destroyed. // as the frame is destroyed.
DCHECK(reuse_callback_); DCHECK(reuse_callback_);
reuse_callback_ = base::Closure(); reuse_callback_ = base::OnceClosure();
} else { } else {
delete this; delete this;
} }
......
...@@ -212,8 +212,8 @@ class TestRasterContextProvider ...@@ -212,8 +212,8 @@ class TestRasterContextProvider
TestRasterContextProvider(TestRasterContextProvider&) = delete; TestRasterContextProvider(TestRasterContextProvider&) = delete;
TestRasterContextProvider& operator=(TestRasterContextProvider&) = delete; TestRasterContextProvider& operator=(TestRasterContextProvider&) = delete;
void SetOnDestroyedClosure(base::Closure on_destroyed) { void SetOnDestroyedClosure(base::OnceClosure on_destroyed) {
on_destroyed_ = on_destroyed; on_destroyed_ = std::move(on_destroyed);
} }
// viz::RasterContextProvider implementation; // viz::RasterContextProvider implementation;
...@@ -277,7 +277,7 @@ class TestRasterContextProvider ...@@ -277,7 +277,7 @@ class TestRasterContextProvider
TestSharedImageInterface shared_image_interface_; TestSharedImageInterface shared_image_interface_;
viz::TestContextSupport gpu_context_support_; viz::TestContextSupport gpu_context_support_;
base::Closure on_destroyed_; base::OnceClosure on_destroyed_;
}; };
} // namespace } // namespace
......
...@@ -30,15 +30,15 @@ struct Env { ...@@ -30,15 +30,15 @@ struct Env {
base::test::SingleThreadTaskEnvironment task_environment; base::test::SingleThreadTaskEnvironment task_environment;
}; };
void OnDecodeComplete(const base::Closure& quit_closure, media::Status status) { void OnDecodeComplete(base::OnceClosure quit_closure, media::Status status) {
quit_closure.Run(); std::move(quit_closure).Run();
} }
void OnInitDone(const base::Closure& quit_closure, void OnInitDone(base::OnceClosure quit_closure,
bool* success_dest, bool* success_dest,
media::Status status) { media::Status status) {
*success_dest = status.is_ok(); *success_dest = status.is_ok();
quit_closure.Run(); std::move(quit_closure).Run();
} }
void OnOutputComplete(scoped_refptr<media::VideoFrame> frame) {} void OnOutputComplete(scoped_refptr<media::VideoFrame> frame) {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment