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

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: cleanup 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/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 024580c2884adf089b8e65e0439967e3d5472ca3..2de9110482e1baa4a2583606feeb6e4127f9d2de 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"
@@ -25,6 +26,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"
@@ -235,17 +237,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.

Powered by Google App Engine
This is Rietveld 408576698