Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Side by Side Diff: content/browser/media_browsertest.cc

Issue 10855016: Disable failing tests on bots. Fix typo in TEST_F vs TEST_P. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Bug. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/string16.h" 7 #include "base/string16.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 } 122 }
123 123
124 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear3gpAacH264) { 124 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear3gpAacH264) {
125 PlayVideo("bear_h264_aac.3gp", GetParam()); 125 PlayVideo("bear_h264_aac.3gp", GetParam());
126 } 126 }
127 127
128 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear3gpAmrnbMpeg4) { 128 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear3gpAmrnbMpeg4) {
129 PlayVideo("bear_mpeg4_amrnb.3gp", GetParam()); 129 PlayVideo("bear_mpeg4_amrnb.3gp", GetParam());
130 } 130 }
131 131
132 IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearWavGsmms) { 132 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) {
133 PlayAudio("bear_gsm_ms.wav", GetParam()); 133 PlayAudio("bear_gsm_ms.wav", GetParam());
134 } 134 }
135 135
136 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) { 136 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) {
137 PlayAudio("bear_mulaw.wav", GetParam()); 137 PlayAudio("bear_mulaw.wav", GetParam());
138 } 138 }
139 139
140 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) { 140 // TODO(dalecurtis): Fails seek test. http://crbug.com/141020
141 PlayAudio("bear.flac", GetParam()); 141 // IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) {
142 } 142 // PlayAudio("bear.flac", GetParam());
143 // }
143 #endif 144 #endif
144 #endif 145 #endif
145 146
146 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { 147 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) {
147 PlayAudio("bear_pcm.wav", GetParam()); 148 PlayAudio("bear_pcm.wav", GetParam());
148 } 149 }
149 150
150 IN_PROC_BROWSER_TEST_P(MediaTest, VideoTulipWebm) { 151 IN_PROC_BROWSER_TEST_P(MediaTest, VideoTulipWebm) {
151 PlayVideo("tulip2.webm", GetParam()); 152 PlayVideo("tulip2.webm", GetParam());
152 } 153 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 RunLayoutTest("video-autoplay.html"); 194 RunLayoutTest("video-autoplay.html");
194 } 195 }
195 196
196 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoLoopTest) { 197 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoLoopTest) {
197 RunLayoutTest("video-loop.html"); 198 RunLayoutTest("video-loop.html");
198 } 199 }
199 200
200 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoNoAutoplayTest) { 201 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoNoAutoplayTest) {
201 RunLayoutTest("video-no-autoplay.html"); 202 RunLayoutTest("video-no-autoplay.html");
202 } 203 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698