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

Unified Diff: media/audio/android/audio_android_unittest.cc

Issue 1806313003: Pass task runners to AudioManager constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments from patch 48 Created 4 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
« no previous file with comments | « media/audio/alsa/audio_manager_alsa.cc ('k') | media/audio/android/audio_manager_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/android/audio_android_unittest.cc
diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
index a918a101b5d92ee07529abe5b5e537a64510fd07..8079c166ce62b4773911abf16ca7176e0cbd0f65 100644
--- a/media/audio/android/audio_android_unittest.cc
+++ b/media/audio/android/audio_android_unittest.cc
@@ -415,11 +415,16 @@ class AudioAndroidOutputTest : public testing::Test {
public:
AudioAndroidOutputTest()
: loop_(new base::MessageLoopForUI()),
- audio_manager_(AudioManager::CreateForTesting()),
+ audio_manager_(AudioManager::CreateForTesting(loop_->task_runner())),
audio_output_stream_(NULL) {
+ // Flush the message loop to ensure that AudioManager is fully initialized.
+ loop_->RunUntilIdle();
}
- ~AudioAndroidOutputTest() override {}
+ ~AudioAndroidOutputTest() override {
+ audio_manager_.reset();
+ loop_->RunUntilIdle();
+ }
protected:
AudioManager* audio_manager() { return audio_manager_.get(); }
@@ -561,7 +566,7 @@ class AudioAndroidOutputTest : public testing::Test {
}
scoped_ptr<base::MessageLoopForUI> loop_;
- scoped_ptr<AudioManager> audio_manager_;
+ ScopedAudioManagerPtr audio_manager_;
AudioParameters audio_output_parameters_;
AudioOutputStream* audio_output_stream_;
base::TimeTicks start_time_;
« no previous file with comments | « media/audio/alsa/audio_manager_alsa.cc ('k') | media/audio/android/audio_manager_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698