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

Unified Diff: chromecast/media/audio/cast_audio_output_stream_unittest.cc

Issue 2784433002: Ensures that audio tasks cannot run after AudioManager is deleted. (Closed)
Patch Set: rebase 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
« no previous file with comments | « chromecast/media/audio/cast_audio_mixer_unittest.cc ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/media/audio/cast_audio_output_stream_unittest.cc
diff --git a/chromecast/media/audio/cast_audio_output_stream_unittest.cc b/chromecast/media/audio/cast_audio_output_stream_unittest.cc
index 244d119b9013148989cbed702d6503dc42419e6d..23683a2070bc3788d357df9c53a937957a541e8f 100644
--- a/chromecast/media/audio/cast_audio_output_stream_unittest.cc
+++ b/chromecast/media/audio/cast_audio_output_stream_unittest.cc
@@ -17,6 +17,7 @@
#include "chromecast/media/audio/cast_audio_manager.h"
#include "chromecast/public/media/cast_decoder_buffer.h"
#include "chromecast/public/media/media_pipeline_backend.h"
+#include "media/audio/test_audio_thread.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -180,9 +181,11 @@ class MockAudioSourceCallback
class FakeAudioManager : public CastAudioManager {
public:
- explicit FakeAudioManager(
- scoped_refptr<base::SingleThreadTaskRunner> task_runner)
- : CastAudioManager(task_runner, task_runner, nullptr, nullptr, nullptr),
+ FakeAudioManager()
+ : CastAudioManager(base::MakeUnique<::media::TestAudioThread>(),
+ nullptr,
+ nullptr,
+ nullptr),
media_pipeline_backend_(nullptr) {}
~FakeAudioManager() override {}
@@ -228,12 +231,10 @@ class CastAudioOutputStreamTest : public ::testing::Test {
protected:
void SetUp() override {
metrics::InitializeMetricsHelperForTesting();
- audio_manager_.reset(new FakeAudioManager(message_loop_.task_runner()));
+ audio_manager_ = base::MakeUnique<FakeAudioManager>();
}
- void TearDown() override {
- audio_manager_.reset();
- }
+ void TearDown() override { audio_manager_->Shutdown(); }
::media::AudioParameters GetAudioParams() {
return ::media::AudioParameters(format_, channel_layout_, sample_rate_,
« no previous file with comments | « chromecast/media/audio/cast_audio_mixer_unittest.cc ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698