Switch MojoAudioOutputIPC away from base::Bind

... and use WTF::Bind instead.

Note that calls were within the same thread, so
WTF::CrossThreadBindOnce were not needed.

BUG=787252
R=guidou@chromium.org

Change-Id: I9e3b5c7a28cbf9d2479c65e90c86cc758f63f564
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2364211
Commit-Queue: Antonio Gomes (GMT-4) <tonikitoo@igalia.com>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801856}

third_party/blink/renderer/modules/media/audio/mojo_audio_output_ipc.cc

@@ -6,12 +6,12 @@
 
 #include <utility>
 
-#include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
 #include "media/audio/audio_device_description.h"
 #include "media/mojo/mojom/audio_output_stream.mojom-blink.h"
 #include "mojo/public/cpp/bindings/callback_helpers.h"
 #include "mojo/public/cpp/system/platform_handle.h"
+#include "third_party/blink/renderer/platform/wtf/functional.h"
 
 namespace blink {
 
@@ -55,8 +55,8 @@ void MojoAudioOutputIPC::RequestDeviceAuthorization(
   DoRequestDeviceAuthorization(
       session_id, device_id,
       mojo::WrapCallbackWithDefaultInvokeIfNotRun(
-          base::BindOnce(&MojoAudioOutputIPC::ReceivedDeviceAuthorization,
-                         weak_factory_.GetWeakPtr(), base::TimeTicks::Now()),
+          WTF::Bind(&MojoAudioOutputIPC::ReceivedDeviceAuthorization,
+                    weak_factory_.GetWeakPtr(), base::TimeTicks::Now()),
           static_cast<media::mojom::blink::OutputDeviceStatus>(
               media::OutputDeviceStatus::OUTPUT_DEVICE_STATUS_ERROR_INTERNAL),
           media::AudioParameters::UnavailableDeviceParams(), String()));
@@ -78,7 +78,7 @@ void MojoAudioOutputIPC::CreateStream(
     DoRequestDeviceAuthorization(
         /*session_id=*/base::UnguessableToken(),
         media::AudioDeviceDescription::kDefaultDeviceId,
-        base::BindOnce(&TrivialAuthorizedCallback));
+        WTF::Bind(&TrivialAuthorizedCallback));
   }
 
   DCHECK_EQ(delegate_, delegate);
@@ -89,8 +89,8 @@ void MojoAudioOutputIPC::CreateStream(
   receiver_.Bind(client_remote.InitWithNewPipeAndPassReceiver());
   // Unretained is safe because |this| owns |receiver_|.
   receiver_.set_disconnect_with_reason_handler(
-      base::BindOnce(&MojoAudioOutputIPC::ProviderClientBindingDisconnected,
-                     base::Unretained(this)));
+      WTF::Bind(&MojoAudioOutputIPC::ProviderClientBindingDisconnected,
+                WTF::Unretained(this)));
   stream_provider_->Acquire(params, std::move(client_remote));
 }
 
@@ -193,8 +193,7 @@ void MojoAudioOutputIPC::DoRequestDeviceAuthorization(
     // OnDeviceAuthorized with ERROR_INTERNAL in the normal case.
     // The AudioOutputIPCDelegate will call CloseStream as necessary.
     io_task_runner_->PostTask(
-        FROM_HERE,
-        base::BindOnce([](AuthorizationCB cb) {}, std::move(callback)));
+        FROM_HERE, WTF::Bind([](AuthorizationCB cb) {}, std::move(callback)));
     return;
   }
 

third_party/blink/renderer/modules/media/audio/mojo_audio_output_ipc_test.cc

@@ -9,7 +9,6 @@
 #include <string>
 #include <utility>
 
-#include "base/bind.h"
 #include "base/optional.h"
 #include "base/run_loop.h"
 #include "base/test/gtest_util.h"
@@ -24,6 +23,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h"
 #include "third_party/blink/renderer/platform/testing/io_task_runner_testing_platform_support.h"
+#include "third_party/blink/renderer/platform/wtf/functional.h"
 
 using testing::_;
 using testing::AtLeast;
@@ -45,7 +45,7 @@ media::AudioParameters Params() {
 }
 
 MojoAudioOutputIPC::FactoryAccessorCB NullAccessor() {
-  return base::BindRepeating(
+  return WTF::BindRepeating(
       []() -> blink::mojom::blink::RendererAudioOutputStreamFactory* {
         return nullptr;
       });
@@ -172,7 +172,7 @@ class TestRemoteFactory
   }
 
   MojoAudioOutputIPC::FactoryAccessorCB GetAccessor() {
-    return base::BindRepeating(&TestRemoteFactory::get, base::Unretained(this));
+    return WTF::BindRepeating(&TestRemoteFactory::get, WTF::Unretained(this));
   }
 
  private: