Index: media/audio/win/audio_output_win_unittest.cc |
diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc |
index 23c85e5918c6ae5737de1738078d49d3cf63229a..a26162ac208b7f47695a895638f383b7749f2840 100644 |
--- a/media/audio/win/audio_output_win_unittest.cc |
+++ b/media/audio/win/audio_output_win_unittest.cc |
@@ -11,6 +11,7 @@ |
#include "base/base_paths.h" |
#include "base/memory/aligned_memory.h" |
+#include "base/memory/ptr_util.h" |
#include "base/message_loop/message_loop.h" |
#include "base/run_loop.h" |
#include "base/sync_socket.h" |
@@ -22,6 +23,7 @@ |
#include "media/audio/audio_unittest_util.h" |
#include "media/audio/mock_audio_source_callback.h" |
#include "media/audio/simple_sources.h" |
+#include "media/audio/test_audio_thread.h" |
#include "media/base/limits.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -154,17 +156,14 @@ class WinAudioTest : public ::testing::Test { |
public: |
WinAudioTest() { |
audio_manager_ = |
- AudioManager::CreateForTesting(message_loop_.task_runner()); |
- base::RunLoop().RunUntilIdle(); |
- } |
- ~WinAudioTest() override { |
- audio_manager_.reset(); |
+ AudioManager::CreateForTesting(base::MakeUnique<TestAudioThread>()); |
base::RunLoop().RunUntilIdle(); |
} |
+ ~WinAudioTest() override { audio_manager_->Shutdown(); } |
protected: |
base::MessageLoop message_loop_; |
- ScopedAudioManagerPtr audio_manager_; |
+ std::unique_ptr<AudioManager> audio_manager_; |
}; |
// =========================================================================== |