Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(692)

Unified Diff: content/browser/renderer_host/media/render_frame_audio_output_stream_factory_unittest.cc

Issue 2869733005: Convert some audio code to OnceCallback. (Closed)
Patch Set: Rebase, comments on unretained. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/render_frame_audio_output_stream_factory_unittest.cc
diff --git a/content/browser/renderer_host/media/render_frame_audio_output_stream_factory_unittest.cc b/content/browser/renderer_host/media/render_frame_audio_output_stream_factory_unittest.cc
index 49b1ecdbd8defa0b915e2db67267f279be723301..57353e23ef6a67f30248285bd4c3eb707ddb0894 100644
--- a/content/browser/renderer_host/media/render_frame_audio_output_stream_factory_unittest.cc
+++ b/content/browser/renderer_host/media/render_frame_audio_output_stream_factory_unittest.cc
@@ -111,17 +111,18 @@ class MockContext : public RendererAudioOutputStreamFactoryContext {
if (auth_ok_) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
- base::Bind(cb, media::OutputDeviceStatus::OUTPUT_DEVICE_STATUS_OK,
- false, GetTestAudioParameters(), "default"));
+ base::BindOnce(std::move(cb),
+ media::OutputDeviceStatus::OUTPUT_DEVICE_STATUS_OK,
+ false, GetTestAudioParameters(), "default"));
return;
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
- base::Bind(cb,
- media::OutputDeviceStatus::
- OUTPUT_DEVICE_STATUS_ERROR_NOT_AUTHORIZED,
- false, media::AudioParameters::UnavailableDeviceParams(),
- ""));
+ base::BindOnce(std::move(cb),
+ media::OutputDeviceStatus::
+ OUTPUT_DEVICE_STATUS_ERROR_NOT_AUTHORIZED,
+ false, media::AudioParameters::UnavailableDeviceParams(),
+ ""));
}
// The event handler for the delegate will be stored at
@@ -222,8 +223,8 @@ TEST(RenderFrameAudioOutputStreamFactoryTest, CreateStream) {
std::string id;
factory_ptr->RequestDeviceAuthorization(
mojo::MakeRequest(&provider), kNoSessionId, "default",
- base::Bind(&AuthCallback, base::Unretained(&status),
- base::Unretained(&params), base::Unretained(&id)));
+ base::BindOnce(&AuthCallback, base::Unretained(&status),
+ base::Unretained(&params), base::Unretained(&id)));
base::RunLoop().RunUntilIdle();
EXPECT_EQ(status, media::OUTPUT_DEVICE_STATUS_OK);
EXPECT_EQ(params.AsHumanReadableString(),
@@ -261,8 +262,8 @@ TEST(RenderFrameAudioOutputStreamFactoryTest, NotAuthorized_Denied) {
std::string id;
factory_ptr->RequestDeviceAuthorization(
mojo::MakeRequest(&output_provider), kNoSessionId, "default",
- base::Bind(&AuthCallback, base::Unretained(&status),
- base::Unretained(&params), base::Unretained(&id)));
+ base::BindOnce(&AuthCallback, base::Unretained(&status),
+ base::Unretained(&params), base::Unretained(&id)));
base::RunLoop().RunUntilIdle();
EXPECT_EQ(status, media::OUTPUT_DEVICE_STATUS_ERROR_NOT_AUTHORIZED);
EXPECT_TRUE(id.empty());
@@ -285,9 +286,9 @@ TEST(RenderFrameAudioOutputStreamFactoryTest, ConnectionError_DeletesStream) {
factory_ptr->RequestDeviceAuthorization(
mojo::MakeRequest(&provider), kNoSessionId, "default",
- base::Bind([](media::OutputDeviceStatus status,
- const media::AudioParameters& params,
- const std::string& id) {}));
+ base::BindOnce([](media::OutputDeviceStatus status,
+ const media::AudioParameters& params,
+ const std::string& id) {}));
base::RunLoop().RunUntilIdle();
provider->Acquire(
@@ -318,9 +319,9 @@ TEST(RenderFrameAudioOutputStreamFactoryTest, DelegateError_DeletesStream) {
factory_ptr->RequestDeviceAuthorization(
mojo::MakeRequest(&provider), kNoSessionId, "default",
- base::Bind([](media::OutputDeviceStatus status,
- const media::AudioParameters& params,
- const std::string& id) {}));
+ base::BindOnce([](media::OutputDeviceStatus status,
+ const media::AudioParameters& params,
+ const std::string& id) {}));
base::RunLoop().RunUntilIdle();
provider->Acquire(
@@ -362,8 +363,8 @@ TEST(RenderFrameAudioOutputStreamFactoryTest, OutOfRangeSessionId_BadMessage) {
EXPECT_FALSE(got_bad_message);
factory_ptr->RequestDeviceAuthorization(
mojo::MakeRequest(&output_provider), session_id, "default",
- base::Bind([](media::OutputDeviceStatus, const media::AudioParameters&,
- const std::string&) {}));
+ base::BindOnce([](media::OutputDeviceStatus,
+ const media::AudioParameters&, const std::string&) {}));
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(got_bad_message);
}

Powered by Google App Engine
This is Rietveld 408576698