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

Unified Diff: media/audio/win/audio_low_latency_output_win_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/win/audio_low_latency_input_win_unittest.cc ('k') | media/audio/win/audio_manager_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/win/audio_low_latency_output_win_unittest.cc
diff --git a/media/audio/win/audio_low_latency_output_win_unittest.cc b/media/audio/win/audio_low_latency_output_win_unittest.cc
index e449ce0545690761674bce79fd87c2ab4923d01c..ff211eac514646da51fd79a3d33f124d02dbbbea 100644
--- a/media/audio/win/audio_low_latency_output_win_unittest.cc
+++ b/media/audio/win/audio_low_latency_output_win_unittest.cc
@@ -13,6 +13,7 @@
#include "base/environment.h"
#include "base/files/file_util.h"
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
#include "base/run_loop.h"
@@ -26,6 +27,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 "media/audio/win/core_audio_util_win.h"
#include "media/base/decoder_buffer.h"
#include "media/base/seekable_buffer.h"
@@ -237,17 +239,14 @@ class WASAPIAudioOutputStreamTest : public ::testing::Test {
public:
WASAPIAudioOutputStreamTest() {
audio_manager_ =
- AudioManager::CreateForTesting(message_loop_.task_runner());
- base::RunLoop().RunUntilIdle();
- }
- ~WASAPIAudioOutputStreamTest() override {
- audio_manager_.reset();
+ AudioManager::CreateForTesting(base::MakeUnique<TestAudioThread>());
base::RunLoop().RunUntilIdle();
}
+ ~WASAPIAudioOutputStreamTest() override { audio_manager_->Shutdown(); }
protected:
base::MessageLoopForUI message_loop_;
- ScopedAudioManagerPtr audio_manager_;
+ std::unique_ptr<AudioManager> audio_manager_;
};
// Test Create(), Close() calling sequence.
« no previous file with comments | « media/audio/win/audio_low_latency_input_win_unittest.cc ('k') | media/audio/win/audio_manager_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698