Finish base::Bind -> Once/Repeating migration for media/blink and /cdm

Use of base::Bind, ::Callback, etc. is deprecated in favor of the more
explicit Once/Repeating versions. Despite being marked as fixed, a few
directories have some remaining uses that were missed in the conversion.
This cl fixes those stragglers in the media/blink and media/cdm
directories. The presubmit is also enabled for these directories to
avoid any future regressions.

Bug: 1141533, 1102651, 1007802
Change-Id: I0a58ba3165c1c8873a25de76065a7425495b62b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2505580Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
Commit-Queue: Alex Turner <alexmt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#822344}

PRESUBMIT.py

@@ -388,9 +388,7 @@ _NOT_CONVERTED_TO_MODERN_BIND_AND_CALLBACK = '|'.join((
   '^ios/chrome/',
   '^ios/web/',
   '^ios/web_view/',
-  '^media/blink/',
   '^media/cast/',
-  '^media/cdm/',
   '^media/filters/',
   '^media/gpu/',
   '^media/mojo/',

media/blink/webmediaplayer_impl.cc

@@ -2919,8 +2919,9 @@ void WebMediaPlayerImpl::StartPipeline() {
       // base::Unretained is safe because |this| owns memory_pressure_listener_.
       memory_pressure_listener_ =
           std::make_unique<base::MemoryPressureListener>(
-              FROM_HERE, base::Bind(&WebMediaPlayerImpl::OnMemoryPressure,
-                                    base::Unretained(this)));
+              FROM_HERE,
+              base::BindRepeating(&WebMediaPlayerImpl::OnMemoryPressure,
+                                  base::Unretained(this)));
     }
   }
 
@@ -3638,8 +3639,8 @@ void WebMediaPlayerImpl::UpdateBackgroundVideoOptimizationState() {
     } else if (update_background_status_cb_.IsCancelled()) {
       // Only trigger updates when we don't have one already scheduled.
       update_background_status_cb_.Reset(
-          base::Bind(&WebMediaPlayerImpl::DisableVideoTrackIfNeeded,
-                     base::Unretained(this)));
+          base::BindOnce(&WebMediaPlayerImpl::DisableVideoTrackIfNeeded,
+                         base::Unretained(this)));
 
       // Defer disable track until we're sure the clip will be backgrounded for
       // some time. Resuming may take half a second, so frequent tab switches

media/blink/webmediaplayer_impl.h

@@ -999,7 +999,7 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
 
   OverlayInfo overlay_info_;
 
-  base::CancelableClosure update_background_status_cb_;
+  base::CancelableOnceClosure update_background_status_cb_;
 
   mojo::Remote<mojom::MediaMetricsProvider> media_metrics_provider_;
   mojo::Remote<mojom::PlaybackEventsRecorder> playback_events_recorder_;

media/cdm/aes_decryptor_unittest.cc

@@ -252,14 +252,15 @@ class AesDecryptorTest : public testing::TestWithParam<TestType> {
   void SetUp() override {
     if (GetParam() == TestType::kAesDecryptor) {
       OnCdmCreated(
-          new AesDecryptor(base::Bind(&MockCdmClient::OnSessionMessage,
-                                      base::Unretained(&cdm_client_)),
-                           base::Bind(&MockCdmClient::OnSessionClosed,
-                                      base::Unretained(&cdm_client_)),
-                           base::Bind(&MockCdmClient::OnSessionKeysChange,
-                                      base::Unretained(&cdm_client_)),
-                           base::Bind(&MockCdmClient::OnSessionExpirationUpdate,
-                                      base::Unretained(&cdm_client_))),
+          new AesDecryptor(
+              base::BindRepeating(&MockCdmClient::OnSessionMessage,
+                                  base::Unretained(&cdm_client_)),
+              base::BindRepeating(&MockCdmClient::OnSessionClosed,
+                                  base::Unretained(&cdm_client_)),
+              base::BindRepeating(&MockCdmClient::OnSessionKeysChange,
+                                  base::Unretained(&cdm_client_)),
+              base::BindRepeating(&MockCdmClient::OnSessionExpirationUpdate,
+                                  base::Unretained(&cdm_client_))),
           std::string());
     } else if (GetParam() == TestType::kCdmAdapter) {
 #if BUILDFLAG(ENABLE_LIBRARY_CDMS)
@@ -283,18 +284,19 @@ class AesDecryptorTest : public testing::TestWithParam<TestType> {
       std::unique_ptr<CdmAllocator> allocator(new SimpleCdmAllocator());
       std::unique_ptr<CdmAuxiliaryHelper> cdm_helper(
           new MockCdmAuxiliaryHelper(std::move(allocator)));
-      CdmAdapter::Create(helper_->KeySystemName(),
-                         cdm_config, create_cdm_func, std::move(cdm_helper),
-                         base::Bind(&MockCdmClient::OnSessionMessage,
-                                    base::Unretained(&cdm_client_)),
-                         base::Bind(&MockCdmClient::OnSessionClosed,
-                                    base::Unretained(&cdm_client_)),
-                         base::Bind(&MockCdmClient::OnSessionKeysChange,
-                                    base::Unretained(&cdm_client_)),
-                         base::Bind(&MockCdmClient::OnSessionExpirationUpdate,
-                                    base::Unretained(&cdm_client_)),
-                         base::BindOnce(&AesDecryptorTest::OnCdmCreated,
-                                        base::Unretained(this)));
+      CdmAdapter::Create(
+          helper_->KeySystemName(), cdm_config, create_cdm_func,
+          std::move(cdm_helper),
+          base::BindRepeating(&MockCdmClient::OnSessionMessage,
+                              base::Unretained(&cdm_client_)),
+          base::BindRepeating(&MockCdmClient::OnSessionClosed,
+                              base::Unretained(&cdm_client_)),
+          base::BindRepeating(&MockCdmClient::OnSessionKeysChange,
+                              base::Unretained(&cdm_client_)),
+          base::BindRepeating(&MockCdmClient::OnSessionExpirationUpdate,
+                              base::Unretained(&cdm_client_)),
+          base::BindOnce(&AesDecryptorTest::OnCdmCreated,
+                         base::Unretained(this)));
 
       base::RunLoop().RunUntilIdle();
 #else

media/cdm/cdm_adapter.cc

@@ -226,7 +226,7 @@ CdmAdapter::CdmAdapter(
   DCHECK(session_expiration_update_cb_);
 
   helper_->SetFileReadCB(
-      base::Bind(&CdmAdapter::OnFileRead, weak_factory_.GetWeakPtr()));
+      base::BindRepeating(&CdmAdapter::OnFileRead, weak_factory_.GetWeakPtr()));
 }
 
 CdmAdapter::~CdmAdapter() {

media/cdm/cdm_adapter_unittest.cc

@@ -140,18 +140,19 @@ class CdmAdapterTestBase : public testing::Test,
     std::unique_ptr<StrictMock<MockCdmAuxiliaryHelper>> cdm_helper(
         new StrictMock<MockCdmAuxiliaryHelper>(std::move(allocator)));
     cdm_helper_ = cdm_helper.get();
-    CdmAdapter::Create(GetKeySystemName(), cdm_config, GetCreateCdmFunc(),
-                       std::move(cdm_helper),
-                       base::Bind(&MockCdmClient::OnSessionMessage,
-                                  base::Unretained(&cdm_client_)),
-                       base::Bind(&MockCdmClient::OnSessionClosed,
-                                  base::Unretained(&cdm_client_)),
-                       base::Bind(&MockCdmClient::OnSessionKeysChange,
-                                  base::Unretained(&cdm_client_)),
-                       base::Bind(&MockCdmClient::OnSessionExpirationUpdate,
-                                  base::Unretained(&cdm_client_)),
-                       base::BindOnce(&CdmAdapterTestBase::OnCdmCreated,
-                                      base::Unretained(this), expected_result));
+    CdmAdapter::Create(
+        GetKeySystemName(), cdm_config, GetCreateCdmFunc(),
+        std::move(cdm_helper),
+        base::BindRepeating(&MockCdmClient::OnSessionMessage,
+                            base::Unretained(&cdm_client_)),
+        base::BindRepeating(&MockCdmClient::OnSessionClosed,
+                            base::Unretained(&cdm_client_)),
+        base::BindRepeating(&MockCdmClient::OnSessionKeysChange,
+                            base::Unretained(&cdm_client_)),
+        base::BindRepeating(&MockCdmClient::OnSessionExpirationUpdate,
+                            base::Unretained(&cdm_client_)),
+        base::BindOnce(&CdmAdapterTestBase::OnCdmCreated,
+                       base::Unretained(this), expected_result));
     RunUntilIdle();
     ASSERT_EQ(expected_result == SUCCESS, !!cdm_);
   }

media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc

@@ -327,11 +327,14 @@ ClearKeyCdm::ClearKeyCdm(HostInterface* host, const std::string& key_system)
       cdm_host_proxy_(new CdmHostProxyImpl<HostInterface>(host)),
       cdm_(new ClearKeyPersistentSessionCdm(
           cdm_host_proxy_.get(),
-          base::Bind(&ClearKeyCdm::OnSessionMessage, base::Unretained(this)),
-          base::Bind(&ClearKeyCdm::OnSessionClosed, base::Unretained(this)),
-          base::Bind(&ClearKeyCdm::OnSessionKeysChange, base::Unretained(this)),
-          base::Bind(&ClearKeyCdm::OnSessionExpirationUpdate,
-                     base::Unretained(this)))),
+          base::BindRepeating(&ClearKeyCdm::OnSessionMessage,
+                              base::Unretained(this)),
+          base::BindRepeating(&ClearKeyCdm::OnSessionClosed,
+                              base::Unretained(this)),
+          base::BindRepeating(&ClearKeyCdm::OnSessionKeysChange,
+                              base::Unretained(this)),
+          base::BindRepeating(&ClearKeyCdm::OnSessionExpirationUpdate,
+                              base::Unretained(this)))),
       key_system_(key_system) {
   DCHECK(g_is_cdm_module_initialized);
 }

media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.cc

@@ -99,10 +99,10 @@ ClearKeyPersistentSessionCdm::ClearKeyPersistentSessionCdm(
       session_message_cb_(session_message_cb),
       session_closed_cb_(session_closed_cb) {
   cdm_ = base::MakeRefCounted<AesDecryptor>(
-      base::Bind(&ClearKeyPersistentSessionCdm::OnSessionMessage,
-                 weak_factory_.GetWeakPtr()),
-      base::Bind(&ClearKeyPersistentSessionCdm::OnSessionClosed,
-                 weak_factory_.GetWeakPtr()),
+      base::BindRepeating(&ClearKeyPersistentSessionCdm::OnSessionMessage,
+                          weak_factory_.GetWeakPtr()),
+      base::BindRepeating(&ClearKeyPersistentSessionCdm::OnSessionClosed,
+                          weak_factory_.GetWeakPtr()),
       session_keys_change_cb, session_expiration_update_cb);
 }
 
@@ -129,8 +129,8 @@ void ClearKeyPersistentSessionCdm::CreateSessionAndGenerateRequest(
     // Since it's a persistent session, we need to save the session ID after
     // it's been created.
     new_promise = std::make_unique<NewPersistentSessionCdmPromise>(
-        base::Bind(&ClearKeyPersistentSessionCdm::AddPersistentSession,
-                   weak_factory_.GetWeakPtr()),
+        base::BindOnce(&ClearKeyPersistentSessionCdm::AddPersistentSession,
+                       weak_factory_.GetWeakPtr()),
         std::move(promise));
   }
   cdm_->CreateSessionAndGenerateRequest(session_type, init_data_type, init_data,