[Code Health] NewExpectedClosure is OnceClosure

NewExpectedClosure returns a base::OnceClosure now and
NewExpectedBoolCB returns a base::OnceCallback.

Bug: 1007799
Change-Id: Ic0fbcbd1b70c1e81920efdf095ba89d6f905c37f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1972816Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
Commit-Queue: Raymond Toy <rtoy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726230}

media/base/test_helpers.cc

@@ -45,16 +45,16 @@ class MockCallback : public base::RefCountedThreadSafe<MockCallback> {
 MockCallback::MockCallback() = default;
 MockCallback::~MockCallback() = default;
 
-base::Closure NewExpectedClosure() {
+base::OnceClosure NewExpectedClosure() {
   StrictMock<MockCallback>* callback = new StrictMock<MockCallback>();
   EXPECT_CALL(*callback, Run());
-  return base::Bind(&MockCallback::Run, WrapRefCounted(callback));
+  return base::BindOnce(&MockCallback::Run, WrapRefCounted(callback));
 }
 
-base::Callback<void(bool)> NewExpectedBoolCB(bool success) {
+base::OnceCallback<void(bool)> NewExpectedBoolCB(bool success) {
   StrictMock<MockCallback>* callback = new StrictMock<MockCallback>();
   EXPECT_CALL(*callback, RunWithBool(success));
-  return base::Bind(&MockCallback::RunWithBool, WrapRefCounted(callback));
+  return base::BindOnce(&MockCallback::RunWithBool, WrapRefCounted(callback));
 }
 
 PipelineStatusCB NewExpectedStatusCB(PipelineStatus status) {

media/base/test_helpers.h

@@ -36,8 +36,8 @@ class DecoderBuffer;
 class MockDemuxerStream;
 
 // Return a callback that expects to be run once.
-base::Closure NewExpectedClosure();
-base::Callback<void(bool)> NewExpectedBoolCB(bool success);
+base::OnceClosure NewExpectedClosure();
+base::OnceCallback<void(bool)> NewExpectedBoolCB(bool success);
 PipelineStatusCB NewExpectedStatusCB(PipelineStatus status);
 
 // Helper class for running a message loop until a callback has run. Useful for

media/filters/decrypting_demuxer_stream.cc

@@ -88,13 +88,13 @@ bool DecryptingDemuxerStream::IsReadPending() const {
   return !read_cb_.is_null();
 }
 
-void DecryptingDemuxerStream::Reset(const base::Closure& closure) {
+void DecryptingDemuxerStream::Reset(base::OnceClosure closure) {
   DVLOG(2) << __func__ << " - state: " << state_;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(state_ != kUninitialized) << state_;
   DCHECK(!reset_cb_);
 
-  reset_cb_ = BindToCurrentLoop(closure);
+  reset_cb_ = BindToCurrentLoop(std::move(closure));
 
   decryptor_->CancelDecrypt(GetDecryptorStreamType());
 

media/filters/decrypting_demuxer_stream.h

@@ -49,7 +49,7 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
   // kPendingDemuxerRead or kPendingDecrypt state, waits for the pending
   // operation to finish before satisfying |closure|. Sets the state to
   // kUninitialized if |this| hasn't been initialized, or to kIdle otherwise.
-  void Reset(const base::Closure& closure);
+  void Reset(base::OnceClosure closure);
 
   // Returns the name of this class for logging purpose.
   std::string GetDisplayName() const;
@@ -151,7 +151,7 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
 
   PipelineStatusCB init_cb_;
   ReadCB read_cb_;
-  base::Closure reset_cb_;
+  base::OnceClosure reset_cb_;
 
   // Pointer to the input demuxer stream that will feed us encrypted buffers.
   DemuxerStream* demuxer_stream_ = nullptr;