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

Unified Diff: media/audio/audio_input_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/audio_input_unittest.cc
diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc
index 2bba0b2268a0c937480ce01b6fe56ec2000ebf94..ae86ba630391fc242b823890e94da82ae96204d3 100644
--- a/media/audio/audio_input_unittest.cc
+++ b/media/audio/audio_input_unittest.cc
@@ -16,6 +16,7 @@
#include "media/audio/audio_io.h"
#include "media/audio/audio_manager.h"
#include "media/audio/audio_unittest_util.h"
+#include "media/audio/test_audio_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace media {
@@ -54,12 +55,12 @@ class AudioInputTest : public testing::Test {
AudioInputTest()
: message_loop_(base::MessageLoop::TYPE_UI),
audio_manager_(AudioManager::CreateForTesting(
- base::ThreadTaskRunnerHandle::Get())),
+ base::MakeUnique<TestAudioThread>())),
audio_input_stream_(NULL) {
base::RunLoop().RunUntilIdle();
}
- ~AudioInputTest() override {}
+ ~AudioInputTest() override { audio_manager_->Shutdown(); }
protected:
bool InputDevicesAvailable() {
@@ -152,7 +153,7 @@ class AudioInputTest : public testing::Test {
void OnLogMessage(const std::string& message) {}
base::TestMessageLoop message_loop_;
- ScopedAudioManagerPtr audio_manager_;
+ std::unique_ptr<AudioManager> audio_manager_;
AudioInputStream* audio_input_stream_;
private:

Powered by Google App Engine
This is Rietveld 408576698