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

Unified Diff: media/audio/audio_input_unittest.cc

Issue 2784433002: Ensures that audio tasks cannot run after AudioManager is deleted. (Closed)
Patch Set: addressed comments 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
Index: media/audio/audio_input_unittest.cc
diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc
index 77d977d963cbcddd94fba285ee808a799d86716b..e7c2a041066c2717d805858a06932feeb14a2e35 100644
--- a/media/audio/audio_input_unittest.cc
+++ b/media/audio/audio_input_unittest.cc
@@ -17,6 +17,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 {
@@ -55,12 +56,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() {
@@ -155,7 +156,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