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

Unified Diff: media/audio/alsa/alsa_output_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 | « media/audio/BUILD.gn ('k') | media/audio/alsa/audio_manager_alsa.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/alsa/alsa_output_unittest.cc
diff --git a/media/audio/alsa/alsa_output_unittest.cc b/media/audio/alsa/alsa_output_unittest.cc
index f2c55411701173a2ab533565e05d9f961c7fc7cb..70ebd8ab2210469623c9dff4d262d894ca2e9f50 100644
--- a/media/audio/alsa/alsa_output_unittest.cc
+++ b/media/audio/alsa/alsa_output_unittest.cc
@@ -17,6 +17,7 @@
#include "media/audio/alsa/audio_manager_alsa.h"
#include "media/audio/fake_audio_log_factory.h"
#include "media/audio/mock_audio_source_callback.h"
+#include "media/audio/test_audio_thread.h"
#include "media/base/audio_timestamp_helper.h"
#include "media/base/data_buffer.h"
#include "media/base/seekable_buffer.h"
@@ -80,8 +81,7 @@ class MockAlsaWrapper : public AlsaWrapper {
class MockAudioManagerAlsa : public AudioManagerAlsa {
public:
MockAudioManagerAlsa()
- : AudioManagerAlsa(base::ThreadTaskRunnerHandle::Get(),
- base::ThreadTaskRunnerHandle::Get(),
+ : AudioManagerAlsa(base::MakeUnique<TestAudioThread>(),
&fake_audio_log_factory_) {}
MOCK_METHOD0(Init, void());
MOCK_METHOD0(HasAudioOutputDevices, bool());
@@ -117,8 +117,7 @@ class AlsaPcmOutputStreamTest : public testing::Test {
mock_manager_.reset(new StrictMock<MockAudioManagerAlsa>());
}
- virtual ~AlsaPcmOutputStreamTest() {
- }
+ virtual ~AlsaPcmOutputStreamTest() { mock_manager_->Shutdown(); }
AlsaPcmOutputStream* CreateStream(ChannelLayout layout) {
return CreateStream(layout, kTestFramesPerPacket);
@@ -178,8 +177,7 @@ class AlsaPcmOutputStreamTest : public testing::Test {
base::TestMessageLoop message_loop_;
StrictMock<MockAlsaWrapper> mock_alsa_wrapper_;
- std::unique_ptr<StrictMock<MockAudioManagerAlsa>, AudioManagerDeleter>
- mock_manager_;
+ std::unique_ptr<StrictMock<MockAudioManagerAlsa>> mock_manager_;
scoped_refptr<DataBuffer> packet_;
private:
« no previous file with comments | « media/audio/BUILD.gn ('k') | media/audio/alsa/audio_manager_alsa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698