summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-09 20:46:38 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-09 20:46:38 +0000
commit69b1fe0d5574eed94ad2fc235fe44eec2ea55f93 (patch)
treeafc529c7d2d853ea110a2f293a98e0f6e505b873
parentb63f218a98a7dec9fd6dfb4e427d765fc95120fe (diff)
downloadchromium_src-69b1fe0d5574eed94ad2fc235fe44eec2ea55f93.zip
chromium_src-69b1fe0d5574eed94ad2fc235fe44eec2ea55f93.tar.gz
chromium_src-69b1fe0d5574eed94ad2fc235fe44eec2ea55f93.tar.bz2
Disables more media tests.
BUG=none TEST=none TBR=imcheng@chromium.org Review URL: http://codereview.chromium.org/3366020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58995 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/media_uitest.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc
index 7d28b47..1713e5f 100644
--- a/chrome/browser/media_uitest.cc
+++ b/chrome/browser/media_uitest.cc
@@ -53,15 +53,18 @@ TEST_F(MediaTest, DISABLED_VideoBearTheora) {
PlayVideo("bear.ogv");
}
-TEST_F(MediaTest, VideoBearSilentTheora) {
+// Crashes, see http://crbug.com/54939
+TEST_F(MediaTest, DISABLED_VideoBearSilentTheora) {
PlayVideo("bear_silent.ogv");
}
-TEST_F(MediaTest, VideoBearWebm) {
+// Crashes, see http://crbug.com/54939
+TEST_F(MediaTest, DISABLED_VideoBearWebm) {
PlayVideo("bear.webm");
}
-TEST_F(MediaTest, VideoBearSilentWebm) {
+// Crashes, see http://crbug.com/54939
+TEST_F(MediaTest, DISABLED_VideoBearSilentWebm) {
PlayVideo("bear_silent.webm");
}
@@ -75,7 +78,8 @@ TEST_F(MediaTest, VideoBearSilentMp4) {
}
#endif
-TEST_F(UILayoutTest, MediaUILayoutTest) {
+// Crashes, see http://crbug.com/54939
+TEST_F(UILayoutTest, DISABLED_MediaUILayoutTest) {
static const char* kResources[] = {
"content",
"media-file.js",