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

Unified Diff: media/audio/cras/cras_unified_unittest.cc

Issue 2784433002: Ensures that audio tasks cannot run after AudioManager is deleted. (Closed)
Patch Set: chromeos and android build Created 3 years, 8 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: media/audio/cras/cras_unified_unittest.cc
diff --git a/media/audio/cras/cras_unified_unittest.cc b/media/audio/cras/cras_unified_unittest.cc
index 89a3ef0b8a39efbe9a0ec23cc0a7ad304955d017..52fe11ad3149f786889b2b59a50f63c621e17fcc 100644
--- a/media/audio/cras/cras_unified_unittest.cc
+++ b/media/audio/cras/cras_unified_unittest.cc
@@ -63,7 +63,11 @@ class CrasUnifiedStreamTest : public testing::Test {
base::RunLoop().RunUntilIdle();
}
- ~CrasUnifiedStreamTest() override {}
+ ~CrasUnifiedStreamTest() override {
+ mock_manager_->GetTaskRunner()->PostTask(
+ FROM_HERE, base::Bind(&media::AudioManager::Shutdown,
+ base::Unretained(mock_manager_.get())));
+ }
CrasUnifiedStream* CreateStream(ChannelLayout layout) {
return CreateStream(layout, kTestFramesPerPacket);
@@ -88,8 +92,7 @@ class CrasUnifiedStreamTest : public testing::Test {
static const uint32_t kTestFramesPerPacket;
base::TestMessageLoop message_loop_;
- std::unique_ptr<StrictMock<MockAudioManagerCras>, AudioManagerDeleter>
- mock_manager_;
+ std::unique_ptr<StrictMock<MockAudioManagerCras>> mock_manager_;
private:
DISALLOW_COPY_AND_ASSIGN(CrasUnifiedStreamTest);

Powered by Google App Engine
This is Rietveld 408576698