Convert media/cdm to use base::OnceCallback/base::RepeatingCallback

Bug: 1007802
Test: Modified browser_test passes
Change-Id: I7847afc1c4989e31ebbd46482be1e14765faed13
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2028929
Commit-Queue: John Rummell <jrummell@chromium.org>
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736960}

media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.cc

@@ -508,8 +508,8 @@ void FileIOTestRunner::AddTests() {
   END_TEST_CASE
 }
 
-void FileIOTestRunner::RunAllTests(const CompletionCB& completion_cb) {
-  completion_cb_ = completion_cb;
+void FileIOTestRunner::RunAllTests(CompletionCB completion_cb) {
+  completion_cb_ = std::move(completion_cb);
   total_num_tests_ = remaining_tests_.size();
   RunNextTest();
 }
@@ -524,8 +524,8 @@ void FileIOTestRunner::RunNextTest() {
     return;
   }
 
-  remaining_tests_.front()->Run(
-      base::Bind(&FileIOTestRunner::OnTestComplete, base::Unretained(this)));
+  remaining_tests_.front()->Run(base::BindOnce(
+      &FileIOTestRunner::OnTestComplete, base::Unretained(this)));
 }
 
 void FileIOTestRunner::OnTestComplete(bool success) {
@@ -560,9 +560,9 @@ void FileIOTest::AddResultReadEither(Status status,
                                  data_size, data2, data2_size));
 }
 
-void FileIOTest::Run(const CompletionCB& completion_cb) {
+void FileIOTest::Run(CompletionCB completion_cb) {
   FILE_IO_DVLOG(3) << "Run " << test_name_;
-  completion_cb_ = completion_cb;
+  completion_cb_ = std::move(completion_cb);
   DCHECK(!test_steps_.empty() && !IsResult(test_steps_.front()));
   RunNextStep();
 }

media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.h

@@ -21,8 +21,9 @@
 
 namespace media {
 
-typedef base::Callback<void(bool success)> CompletionCB;
-typedef base::Callback<cdm::FileIO*(cdm::FileIOClient* client)> CreateFileIOCB;
+using CompletionCB = base::OnceCallback<void(bool success)>;
+using CreateFileIOCB =
+    base::RepeatingCallback<cdm::FileIO*(cdm::FileIOClient* client)>;
 
 // A customizable test class that tests cdm::FileIO implementation.
 // - To create a test, call AddTestStep() to add a test step. A test step can be
@@ -85,7 +86,7 @@ class FileIOTest : public cdm::FileIOClient {
                            uint32_t data2_size);
 
   // Runs this test case and returns the test result through |completion_cb|.
-  void Run(const CompletionCB& completion_cb);
+  void Run(CompletionCB completion_cb);
 
  private:
   struct TestStep {
@@ -167,7 +168,7 @@ class FileIOTestRunner {
 
   // Run all tests. When tests are completed, the result will be reported in the
   // |completion_cb|.
-  void RunAllTests(const CompletionCB& completion_cb);
+  void RunAllTests(CompletionCB completion_cb);
 
  private:
   void OnTestComplete(bool success);

media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc

@@ -977,10 +977,10 @@ void ClearKeyCdm::OnUnitTestComplete(bool success) {
 }
 
 void ClearKeyCdm::StartFileIOTest() {
-  file_io_test_runner_.reset(new FileIOTestRunner(base::Bind(
+  file_io_test_runner_.reset(new FileIOTestRunner(base::BindRepeating(
       &CdmHostProxy::CreateFileIO, base::Unretained(cdm_host_proxy_.get()))));
-  file_io_test_runner_->RunAllTests(
-      base::Bind(&ClearKeyCdm::OnFileIOTestComplete, base::Unretained(this)));
+  file_io_test_runner_->RunAllTests(base::BindOnce(
+      &ClearKeyCdm::OnFileIOTestComplete, base::Unretained(this)));
 }
 
 void ClearKeyCdm::OnFileIOTestComplete(bool success) {