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

Unified Diff: media/audio/audio_output_proxy_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/audio_output_controller_unittest.cc ('k') | media/audio/cras/audio_manager_cras.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_proxy_unittest.cc
diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
index f03746188f5e40e7160aab4f749780967630e695..3c5d0b552a5ca3448dff03b07ea76ec9ad5aa254 100644
--- a/media/audio/audio_output_proxy_unittest.cc
+++ b/media/audio/audio_output_proxy_unittest.cc
@@ -8,6 +8,7 @@
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/thread_task_runner_handle.h"
#include "build/build_config.h"
#include "media/audio/audio_manager.h"
#include "media/audio/audio_manager_base.h"
@@ -87,10 +88,11 @@ class MockAudioOutputStream : public AudioOutputStream {
class MockAudioManager : public AudioManagerBase {
public:
- MockAudioManager() : AudioManagerBase(&fake_audio_log_factory_) {}
- virtual ~MockAudioManager() {
- Shutdown();
- }
+ MockAudioManager()
+ : AudioManagerBase(base::ThreadTaskRunnerHandle::Get(),
+ base::ThreadTaskRunnerHandle::Get(),
+ &fake_audio_log_factory_) {}
+ ~MockAudioManager() override { Shutdown(); }
MOCK_METHOD0(HasAudioOutputDevices, bool());
MOCK_METHOD0(HasAudioInputDevices, bool());
@@ -143,10 +145,6 @@ namespace media {
class AudioOutputProxyTest : public testing::Test {
protected:
void SetUp() override {
- EXPECT_CALL(manager_, GetTaskRunner())
- .WillRepeatedly(Return(message_loop_.task_runner()));
- EXPECT_CALL(manager_, GetWorkerTaskRunner())
- .WillRepeatedly(Return(message_loop_.task_runner()));
// Use a low sample rate and large buffer size when testing otherwise the
// FakeAudioOutputStream will keep the message loop busy indefinitely; i.e.,
// RunUntilIdle() will never terminate.
« no previous file with comments | « media/audio/audio_output_controller_unittest.cc ('k') | media/audio/cras/audio_manager_cras.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698