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

Unified Diff: media/audio/mac/audio_auhal_mac_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/linux/audio_manager_linux.cc ('k') | media/audio/mac/audio_low_latency_input_mac_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/mac/audio_auhal_mac_unittest.cc
diff --git a/media/audio/mac/audio_auhal_mac_unittest.cc b/media/audio/mac/audio_auhal_mac_unittest.cc
index 1cbba3133d0a33b9097ea7a21532f8ba9a2ac5f4..2ddc9d143e6cd7be9cdd3fc2b0870c908af5f70e 100644
--- a/media/audio/mac/audio_auhal_mac_unittest.cc
+++ b/media/audio/mac/audio_auhal_mac_unittest.cc
@@ -14,6 +14,7 @@
#include "media/audio/audio_manager.h"
#include "media/audio/audio_unittest_util.h"
#include "media/audio/mock_audio_source_callback.h"
+#include "media/audio/test_audio_thread.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -40,13 +41,13 @@ class AUHALStreamTest : public testing::Test {
AUHALStreamTest()
: message_loop_(base::MessageLoop::TYPE_UI),
manager_(AudioManager::CreateForTesting(
- base::ThreadTaskRunnerHandle::Get())),
+ base::MakeUnique<TestAudioThread>())),
manager_device_info_(manager_.get()) {
// Wait for the AudioManager to finish any initialization on the audio loop.
base::RunLoop().RunUntilIdle();
}
- ~AUHALStreamTest() override {}
+ ~AUHALStreamTest() override { manager_->Shutdown(); }
AudioOutputStream* Create() {
return manager_->MakeAudioOutputStream(
@@ -62,7 +63,7 @@ class AUHALStreamTest : public testing::Test {
protected:
base::TestMessageLoop message_loop_;
- ScopedAudioManagerPtr manager_;
+ std::unique_ptr<AudioManager> manager_;
AudioDeviceInfoAccessorForTests manager_device_info_;
MockAudioSourceCallback source_;
std::string log_message_;
« no previous file with comments | « media/audio/linux/audio_manager_linux.cc ('k') | media/audio/mac/audio_low_latency_input_mac_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698