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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/audio/audio_output_controller_unittest.cc

Issue 8818012: Remove the AudioManager singleton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Made ResourceContext::audio_manager() abide the same rules as other accessors Created 9 years 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
« media/audio/audio_output_controller.h ('K') | « media/audio/audio_output_controller.cc ('k') | media/audio/audio_output_dispatcher.h » ('j') | media/audio/audio_output_proxy_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_controller_unittest.cc
===================================================================
--- media/audio/audio_output_controller_unittest.cc (revision 113173)
+++ media/audio/audio_output_controller_unittest.cc (working copy)
@@ -61,12 +61,6 @@
DISALLOW_COPY_AND_ASSIGN(MockAudioOutputControllerSyncReader);
};
-static bool HasAudioOutputDevices() {
- AudioManager* audio_man = AudioManager::GetAudioManager();
- CHECK(audio_man);
- return audio_man->HasAudioOutputDevices();
-}
-
static bool IsRunningHeadless() {
scoped_ptr<base::Environment> env(base::Environment::Create());
if (env->HasVar("CHROME_HEADLESS"))
@@ -91,9 +85,13 @@
}
TEST(AudioOutputControllerTest, CreateAndClose) {
- if (!HasAudioOutputDevices() || IsRunningHeadless())
+ if (IsRunningHeadless())
return;
+ scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+ if (!audio_manager->HasAudioOutputDevices())
+ return;
+
MockAudioOutputControllerEventHandler event_handler;
EXPECT_CALL(event_handler, OnCreated(NotNull()))
@@ -103,7 +101,8 @@
AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout,
kSampleRate, kBitsPerSample, kSamplesPerPacket);
scoped_refptr<AudioOutputController> controller =
- AudioOutputController::Create(&event_handler, params, kBufferCapacity);
+ AudioOutputController::Create(audio_manager.get(), &event_handler, params,
scherkus (not reviewing) 2011/12/09 22:47:30 nit: .get() not needed for refptr here + below
tommi (sloooow) - chröme 2011/12/10 00:11:14 Done.
+ kBufferCapacity);
ASSERT_TRUE(controller.get());
// Close the controller immediately.
@@ -111,9 +110,13 @@
}
TEST(AudioOutputControllerTest, PlayAndClose) {
- if (!HasAudioOutputDevices() || IsRunningHeadless())
+ if (IsRunningHeadless())
return;
+ scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+ if (!audio_manager->HasAudioOutputDevices())
+ return;
+
MockAudioOutputControllerEventHandler event_handler;
base::WaitableEvent event(false, false);
@@ -133,7 +136,8 @@
AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout,
kSampleRate, kBitsPerSample, kSamplesPerPacket);
scoped_refptr<AudioOutputController> controller =
- AudioOutputController::Create(&event_handler, params, kBufferCapacity);
+ AudioOutputController::Create(audio_manager.get(), &event_handler, params,
+ kBufferCapacity);
ASSERT_TRUE(controller.get());
// Wait for OnCreated() to be called.
@@ -153,9 +157,13 @@
}
TEST(AudioOutputControllerTest, PlayAndCloseLowLatency) {
- if (!HasAudioOutputDevices() || IsRunningHeadless())
+ if (IsRunningHeadless())
return;
+ scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+ if (!audio_manager->HasAudioOutputDevices())
+ return;
+
MockAudioOutputControllerEventHandler event_handler;
base::WaitableEvent event(false, false);
@@ -183,7 +191,8 @@
AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout,
kSampleRate, kBitsPerSample, kSamplesPerPacket);
scoped_refptr<AudioOutputController> controller =
- AudioOutputController::CreateLowLatency(&event_handler,
+ AudioOutputController::CreateLowLatency(audio_manager.get(),
+ &event_handler,
params,
&sync_reader);
ASSERT_TRUE(controller.get());
@@ -205,9 +214,13 @@
}
TEST(AudioOutputControllerTest, PlayPauseClose) {
- if (!HasAudioOutputDevices() || IsRunningHeadless())
+ if (IsRunningHeadless())
return;
+ scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+ if (!audio_manager->HasAudioOutputDevices())
+ return;
+
MockAudioOutputControllerEventHandler event_handler;
base::WaitableEvent event(false, false);
base::WaitableEvent pause_event(false, false);
@@ -234,7 +247,8 @@
AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout,
kSampleRate, kBitsPerSample, kSamplesPerPacket);
scoped_refptr<AudioOutputController> controller =
- AudioOutputController::Create(&event_handler, params, kBufferCapacity);
+ AudioOutputController::Create(audio_manager.get(), &event_handler, params,
+ kBufferCapacity);
ASSERT_TRUE(controller.get());
// Wait for OnCreated() to be called.
@@ -259,9 +273,13 @@
}
TEST(AudioOutputControllerTest, PlayPauseCloseLowLatency) {
- if (!HasAudioOutputDevices() || IsRunningHeadless())
+ if (IsRunningHeadless())
return;
+ scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+ if (!audio_manager->HasAudioOutputDevices())
+ return;
+
MockAudioOutputControllerEventHandler event_handler;
base::WaitableEvent event(false, false);
base::WaitableEvent pause_event(false, false);
@@ -286,7 +304,8 @@
AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout,
kSampleRate, kBitsPerSample, kSamplesPerPacket);
scoped_refptr<AudioOutputController> controller =
- AudioOutputController::CreateLowLatency(&event_handler,
+ AudioOutputController::CreateLowLatency(audio_manager.get(),
+ &event_handler,
params,
&sync_reader);
ASSERT_TRUE(controller.get());
@@ -304,9 +323,13 @@
}
TEST(AudioOutputControllerTest, PlayPausePlay) {
- if (!HasAudioOutputDevices() || IsRunningHeadless())
+ if (IsRunningHeadless())
return;
+ scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+ if (!audio_manager->HasAudioOutputDevices())
+ return;
+
MockAudioOutputControllerEventHandler event_handler;
base::WaitableEvent event(false, false);
base::WaitableEvent pause_event(false, false);
@@ -339,7 +362,8 @@
AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout,
kSampleRate, kBitsPerSample, kSamplesPerPacket);
scoped_refptr<AudioOutputController> controller =
- AudioOutputController::Create(&event_handler, params, kBufferCapacity);
+ AudioOutputController::Create(audio_manager.get(), &event_handler, params,
+ kBufferCapacity);
ASSERT_TRUE(controller.get());
// Wait for OnCreated() to be called.
@@ -374,16 +398,20 @@
}
TEST(AudioOutputControllerTest, HardwareBufferTooLarge) {
- if (!HasAudioOutputDevices() || IsRunningHeadless())
+ if (IsRunningHeadless())
return;
+ scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+ if (!audio_manager->HasAudioOutputDevices())
+ return;
+
// Create an audio device with a very large hardware buffer size.
MockAudioOutputControllerEventHandler event_handler;
AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout,
kSampleRate, kBitsPerSample,
kSamplesPerPacket * 1000);
scoped_refptr<AudioOutputController> controller =
- AudioOutputController::Create(&event_handler, params,
+ AudioOutputController::Create(audio_manager.get(), &event_handler, params,
kBufferCapacity);
// Use assert because we don't stop the device and assume we can't
@@ -392,9 +420,13 @@
}
TEST(AudioOutputControllerTest, CloseTwice) {
- if (!HasAudioOutputDevices() || IsRunningHeadless())
+ if (IsRunningHeadless())
return;
+ scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+ if (!audio_manager->HasAudioOutputDevices())
+ return;
+
MockAudioOutputControllerEventHandler event_handler;
base::WaitableEvent event(false, false);
@@ -410,7 +442,8 @@
AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout,
kSampleRate, kBitsPerSample, kSamplesPerPacket);
scoped_refptr<AudioOutputController> controller =
- AudioOutputController::Create(&event_handler, params, kBufferCapacity);
+ AudioOutputController::Create(audio_manager.get(), &event_handler, params,
+ kBufferCapacity);
ASSERT_TRUE(controller.get());
// Wait for OnCreated() to be called.
« media/audio/audio_output_controller.h ('K') | « media/audio/audio_output_controller.cc ('k') | media/audio/audio_output_dispatcher.h » ('j') | media/audio/audio_output_proxy_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698