Commit 90d3236a authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

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: default avatarGuido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801856}
parent 4a3abcfe
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
#include <utility> #include <utility>
#include "base/bind.h"
#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros.h"
#include "media/audio/audio_device_description.h" #include "media/audio/audio_device_description.h"
#include "media/mojo/mojom/audio_output_stream.mojom-blink.h" #include "media/mojo/mojom/audio_output_stream.mojom-blink.h"
#include "mojo/public/cpp/bindings/callback_helpers.h" #include "mojo/public/cpp/bindings/callback_helpers.h"
#include "mojo/public/cpp/system/platform_handle.h" #include "mojo/public/cpp/system/platform_handle.h"
#include "third_party/blink/renderer/platform/wtf/functional.h"
namespace blink { namespace blink {
...@@ -55,7 +55,7 @@ void MojoAudioOutputIPC::RequestDeviceAuthorization( ...@@ -55,7 +55,7 @@ void MojoAudioOutputIPC::RequestDeviceAuthorization(
DoRequestDeviceAuthorization( DoRequestDeviceAuthorization(
session_id, device_id, session_id, device_id,
mojo::WrapCallbackWithDefaultInvokeIfNotRun( mojo::WrapCallbackWithDefaultInvokeIfNotRun(
base::BindOnce(&MojoAudioOutputIPC::ReceivedDeviceAuthorization, WTF::Bind(&MojoAudioOutputIPC::ReceivedDeviceAuthorization,
weak_factory_.GetWeakPtr(), base::TimeTicks::Now()), weak_factory_.GetWeakPtr(), base::TimeTicks::Now()),
static_cast<media::mojom::blink::OutputDeviceStatus>( static_cast<media::mojom::blink::OutputDeviceStatus>(
media::OutputDeviceStatus::OUTPUT_DEVICE_STATUS_ERROR_INTERNAL), media::OutputDeviceStatus::OUTPUT_DEVICE_STATUS_ERROR_INTERNAL),
...@@ -78,7 +78,7 @@ void MojoAudioOutputIPC::CreateStream( ...@@ -78,7 +78,7 @@ void MojoAudioOutputIPC::CreateStream(
DoRequestDeviceAuthorization( DoRequestDeviceAuthorization(
/*session_id=*/base::UnguessableToken(), /*session_id=*/base::UnguessableToken(),
media::AudioDeviceDescription::kDefaultDeviceId, media::AudioDeviceDescription::kDefaultDeviceId,
base::BindOnce(&TrivialAuthorizedCallback)); WTF::Bind(&TrivialAuthorizedCallback));
} }
DCHECK_EQ(delegate_, delegate); DCHECK_EQ(delegate_, delegate);
...@@ -89,8 +89,8 @@ void MojoAudioOutputIPC::CreateStream( ...@@ -89,8 +89,8 @@ void MojoAudioOutputIPC::CreateStream(
receiver_.Bind(client_remote.InitWithNewPipeAndPassReceiver()); receiver_.Bind(client_remote.InitWithNewPipeAndPassReceiver());
// Unretained is safe because |this| owns |receiver_|. // Unretained is safe because |this| owns |receiver_|.
receiver_.set_disconnect_with_reason_handler( receiver_.set_disconnect_with_reason_handler(
base::BindOnce(&MojoAudioOutputIPC::ProviderClientBindingDisconnected, WTF::Bind(&MojoAudioOutputIPC::ProviderClientBindingDisconnected,
base::Unretained(this))); WTF::Unretained(this)));
stream_provider_->Acquire(params, std::move(client_remote)); stream_provider_->Acquire(params, std::move(client_remote));
} }
...@@ -193,8 +193,7 @@ void MojoAudioOutputIPC::DoRequestDeviceAuthorization( ...@@ -193,8 +193,7 @@ void MojoAudioOutputIPC::DoRequestDeviceAuthorization(
// OnDeviceAuthorized with ERROR_INTERNAL in the normal case. // OnDeviceAuthorized with ERROR_INTERNAL in the normal case.
// The AudioOutputIPCDelegate will call CloseStream as necessary. // The AudioOutputIPCDelegate will call CloseStream as necessary.
io_task_runner_->PostTask( io_task_runner_->PostTask(
FROM_HERE, FROM_HERE, WTF::Bind([](AuthorizationCB cb) {}, std::move(callback)));
base::BindOnce([](AuthorizationCB cb) {}, std::move(callback)));
return; return;
} }
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include "base/bind.h"
#include "base/optional.h" #include "base/optional.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/test/gtest_util.h" #include "base/test/gtest_util.h"
...@@ -24,6 +23,7 @@ ...@@ -24,6 +23,7 @@
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.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/testing/io_task_runner_testing_platform_support.h"
#include "third_party/blink/renderer/platform/wtf/functional.h"
using testing::_; using testing::_;
using testing::AtLeast; using testing::AtLeast;
...@@ -45,7 +45,7 @@ media::AudioParameters Params() { ...@@ -45,7 +45,7 @@ media::AudioParameters Params() {
} }
MojoAudioOutputIPC::FactoryAccessorCB NullAccessor() { MojoAudioOutputIPC::FactoryAccessorCB NullAccessor() {
return base::BindRepeating( return WTF::BindRepeating(
[]() -> blink::mojom::blink::RendererAudioOutputStreamFactory* { []() -> blink::mojom::blink::RendererAudioOutputStreamFactory* {
return nullptr; return nullptr;
}); });
...@@ -172,7 +172,7 @@ class TestRemoteFactory ...@@ -172,7 +172,7 @@ class TestRemoteFactory
} }
MojoAudioOutputIPC::FactoryAccessorCB GetAccessor() { MojoAudioOutputIPC::FactoryAccessorCB GetAccessor() {
return base::BindRepeating(&TestRemoteFactory::get, base::Unretained(this)); return WTF::BindRepeating(&TestRemoteFactory::get, WTF::Unretained(this));
} }
private: private:
......
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