summaryrefslogtreecommitdiffstats
path: root/media/audio/mac
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-15 17:35:04 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-15 17:35:04 +0000
commit7b52361dd69914600e40db052cf7c4bf8671dba8 (patch)
tree8fc761b27815f655840f5e9bf7d61b4868578119 /media/audio/mac
parent3dfc972e392157dc7f5e31b3530a98397c6a1a33 (diff)
downloadchromium_src-7b52361dd69914600e40db052cf7c4bf8671dba8.zip
chromium_src-7b52361dd69914600e40db052cf7c4bf8671dba8.tar.gz
chromium_src-7b52361dd69914600e40db052cf7c4bf8671dba8.tar.bz2
Make AudioManager non-refcounted.
BUG=107087 TEST=media and content unit tests Review URL: https://chromiumcodereview.appspot.com/9382040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/mac')
-rw-r--r--media/audio/mac/audio_low_latency_input_mac_unittest.cc2
-rw-r--r--media/audio/mac/audio_output_mac_unittest.cc10
2 files changed, 6 insertions, 6 deletions
diff --git a/media/audio/mac/audio_low_latency_input_mac_unittest.cc b/media/audio/mac/audio_low_latency_input_mac_unittest.cc
index b7be3f4..fdd170e 100644
--- a/media/audio/mac/audio_low_latency_input_mac_unittest.cc
+++ b/media/audio/mac/audio_low_latency_input_mac_unittest.cc
@@ -125,7 +125,7 @@ class MacAudioInputTest : public testing::Test {
return ais;
}
- scoped_refptr<AudioManager> audio_manager_;
+ scoped_ptr<AudioManager> audio_manager_;
};
// Test Create(), Close().
diff --git a/media/audio/mac/audio_output_mac_unittest.cc b/media/audio/mac/audio_output_mac_unittest.cc
index 76f15a9..71a7f40 100644
--- a/media/audio/mac/audio_output_mac_unittest.cc
+++ b/media/audio/mac/audio_output_mac_unittest.cc
@@ -51,7 +51,7 @@ TEST(MacAudioTest, SineWaveAudio16MonoTest) {
// Test that can it be created and closed.
TEST(MacAudioTest, PCMWaveStreamGetAndClose) {
- scoped_refptr<AudioManager> audio_man(AudioManager::Create());
+ scoped_ptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
@@ -63,7 +63,7 @@ TEST(MacAudioTest, PCMWaveStreamGetAndClose) {
// Test that it can be opened and closed.
TEST(MacAudioTest, PCMWaveStreamOpenAndClose) {
- scoped_refptr<AudioManager> audio_man(AudioManager::Create());
+ scoped_ptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
AudioOutputStream* oas = audio_man->MakeAudioOutputStream(
@@ -79,7 +79,7 @@ TEST(MacAudioTest, PCMWaveStreamOpenAndClose) {
// pops or noises while the sound is playing. The sound must also be identical
// to the sound of PCMWaveStreamPlay200HzTone22KssMono test.
TEST(MacAudioTest, PCMWaveStreamPlay200HzTone44KssMono) {
- scoped_refptr<AudioManager> audio_man(AudioManager::Create());
+ scoped_ptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
uint32 frames_100_ms = AudioParameters::kAudioCDSampleRate / 10;
@@ -109,7 +109,7 @@ TEST(MacAudioTest, PCMWaveStreamPlay200HzTone44KssMono) {
// or noises while the sound is playing. The sound must also be identical to the
// sound of PCMWaveStreamPlay200HzTone44KssMono test.
TEST(MacAudioTest, PCMWaveStreamPlay200HzTone22KssMono) {
- scoped_refptr<AudioManager> audio_man(AudioManager::Create());
+ scoped_ptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;
uint32 frames_100_ms = AudioParameters::kAudioCDSampleRate / 10;
@@ -135,7 +135,7 @@ static void ClearBuffer(AudioOutputStream* stream, uint8* dest,
}
TEST(MacAudioTest, PCMWaveStreamPendingBytes) {
- scoped_refptr<AudioManager> audio_man(AudioManager::Create());
+ scoped_ptr<AudioManager> audio_man(AudioManager::Create());
if (!audio_man->HasAudioOutputDevices())
return;