summaryrefslogtreecommitdiffstats
path: root/media/audio/audio_input_device_unittest.cc
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/audio_input_device_unittest.cc
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/audio_input_device_unittest.cc')
-rw-r--r--media/audio/audio_input_device_unittest.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/media/audio/audio_input_device_unittest.cc b/media/audio/audio_input_device_unittest.cc
index 72e93d2..0917b79 100644
--- a/media/audio/audio_input_device_unittest.cc
+++ b/media/audio/audio_input_device_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -20,8 +20,9 @@ using media::AudioDeviceNames;
class AudioInputDeviceTest
: public ::testing::Test {
protected:
- AudioInputDeviceTest() : com_init_(ScopedCOMInitializer::kMTA) {
- audio_manager_ = AudioManager::Create();
+ AudioInputDeviceTest()
+ : audio_manager_(AudioManager::Create()),
+ com_init_(ScopedCOMInitializer::kMTA) {
}
#if defined(OS_WIN)
@@ -73,7 +74,7 @@ class AudioInputDeviceTest
}
}
- scoped_refptr<AudioManager> audio_manager_;
+ scoped_ptr<AudioManager> audio_manager_;
// The MMDevice API requires COM to be initialized on the current thread.
ScopedCOMInitializer com_init_;