summaryrefslogtreecommitdiffstats
path: root/chrome/browser/media_uitest.cc
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-22 20:50:44 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-22 20:50:44 +0000
commit0ac64c98bc6f6015a833ce9297bd57138ce9eb2d (patch)
treee51ba399c4ab5a06dde0368826de529ff68f8cac /chrome/browser/media_uitest.cc
parent842ffc55330e73a0a33ec9ea8facced86b348de5 (diff)
downloadchromium_src-0ac64c98bc6f6015a833ce9297bd57138ce9eb2d.zip
chromium_src-0ac64c98bc6f6015a833ce9297bd57138ce9eb2d.tar.gz
chromium_src-0ac64c98bc6f6015a833ce9297bd57138ce9eb2d.tar.bz2
Ignore errors about creating audio output stream
Instead of failing the media playback pipeline completely, this change will ignores all errors reported by the browser about audio output streams. This is the first step towards handling audio hardware errors. TEST=MediaTest.VideoBearTheora Review URL: http://codereview.chromium.org/159205 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21318 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/media_uitest.cc')
-rw-r--r--chrome/browser/media_uitest.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc
index 41b949c..60360e6 100644
--- a/chrome/browser/media_uitest.cc
+++ b/chrome/browser/media_uitest.cc
@@ -50,10 +50,8 @@ class MediaTest : public UITest {
// <video> and <audio> only works stably on Windows.
#if defined(OS_WIN)
-// TODO(hclam): The following test is disabled because it contains audio and
-// this test doesn't work with audio device.
-TEST_F(MediaTest, DISABLED_VideoBearH264) {
- PlayVideo("bear.mp4");
+TEST_F(MediaTest, VideoBearTheora) {
+ PlayVideo("bear.ogv");
}
TEST_F(MediaTest, VideoBearSilentTheora) {