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

Unified Diff: media/audio/audio_output_controller_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/audio_manager_unittest.cc ('k') | media/audio/audio_output_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_controller_unittest.cc
diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
index bb786e923bfe3d03344c9e7644aa0773d15ce9f1..30e185db14426a5a2013c051f6887b3056bc707f 100644
--- a/media/audio/audio_output_controller_unittest.cc
+++ b/media/audio/audio_output_controller_unittest.cc
@@ -22,6 +22,7 @@
#include "base/time/time.h"
#include "media/audio/audio_device_description.h"
#include "media/audio/audio_source_diverter.h"
+#include "media/audio/test_audio_thread.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -112,11 +113,11 @@ class AudioOutputControllerTest : public testing::Test {
public:
AudioOutputControllerTest()
: audio_manager_(AudioManager::CreateForTesting(
- base::ThreadTaskRunnerHandle::Get())) {
+ base::MakeUnique<TestAudioThread>())) {
base::RunLoop().RunUntilIdle();
}
- ~AudioOutputControllerTest() override {}
+ ~AudioOutputControllerTest() override { audio_manager_->Shutdown(); }
protected:
void Create(int samples_per_packet) {
@@ -263,7 +264,7 @@ class AudioOutputControllerTest : public testing::Test {
private:
base::TestMessageLoop message_loop_;
- ScopedAudioManagerPtr audio_manager_;
+ std::unique_ptr<AudioManager> audio_manager_;
MockAudioOutputControllerEventHandler mock_event_handler_;
MockAudioOutputControllerSyncReader mock_sync_reader_;
MockAudioOutputStream mock_stream_;
« no previous file with comments | « media/audio/audio_manager_unittest.cc ('k') | media/audio/audio_output_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698