summaryrefslogtreecommitdiffstats
path: root/content/renderer
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-10 08:49:19 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-10 08:49:19 +0000
commit4c023028d3d1150b35592881880259094eba0b2d (patch)
tree20d0f7721ba0214b25a56aa66dcb00b22b1645a6 /content/renderer
parent0ac1b7125789e254d88cbf5667db859f9af68a02 (diff)
downloadchromium_src-4c023028d3d1150b35592881880259094eba0b2d.zip
chromium_src-4c023028d3d1150b35592881880259094eba0b2d.tar.gz
chromium_src-4c023028d3d1150b35592881880259094eba0b2d.tar.bz2
Add a COM initializer for the IO thread to accomodate the WASAPI changes and enable two tests now that webrtc has been updated (see r109241).
Review URL: http://codereview.chromium.org/8509010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
-rw-r--r--content/renderer/media/webrtc_audio_device_unittest.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/content/renderer/media/webrtc_audio_device_unittest.cc b/content/renderer/media/webrtc_audio_device_unittest.cc
index 10d4ba8..ec54ffe 100644
--- a/content/renderer/media/webrtc_audio_device_unittest.cc
+++ b/content/renderer/media/webrtc_audio_device_unittest.cc
@@ -45,9 +45,7 @@ bool IsRunningHeadless() {
// Basic test that instantiates and initializes an instance of
// WebRtcAudioDeviceImpl.
-// TODO(tommi): Re-enable when the flakiness of CpuWindows in webrtc has
-// been fixed.
-TEST_F(WebRTCAudioDeviceTest, DISABLED_Construct) {
+TEST_F(WebRTCAudioDeviceTest, Construct) {
AudioUtil audio_util;
set_audio_util_callback(&audio_util);
scoped_refptr<WebRtcAudioDeviceImpl> audio_device(
@@ -65,9 +63,7 @@ TEST_F(WebRTCAudioDeviceTest, DISABLED_Construct) {
// Uses WebRtcAudioDeviceImpl to play a local wave file.
// Disabled when running headless since the bots don't have the required config.
-// TODO(tommi): Re-enable when the flakiness of CpuWindows in webrtc has
-// been fixed.
-TEST_F(WebRTCAudioDeviceTest, DISABLED_PlayLocalFile) {
+TEST_F(WebRTCAudioDeviceTest, PlayLocalFile) {
if (IsRunningHeadless())
return;