OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "content/browser/media/media_browsertest.h" | 5 #include "content/browser/media/media_browsertest.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 PlayVideo("bear_h264_aac.3gp", GetParam()); | 213 PlayVideo("bear_h264_aac.3gp", GetParam()); |
214 } | 214 } |
215 | 215 |
216 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear3gpAmrnbMpeg4) { | 216 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear3gpAmrnbMpeg4) { |
217 PlayVideo("bear_mpeg4_amrnb.3gp", GetParam()); | 217 PlayVideo("bear_mpeg4_amrnb.3gp", GetParam()); |
218 } | 218 } |
219 | 219 |
220 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) { | 220 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) { |
221 PlayAudio("bear_gsm_ms.wav", GetParam()); | 221 PlayAudio("bear_gsm_ms.wav", GetParam()); |
222 } | 222 } |
223 | |
224 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) { | |
225 PlayAudio("bear.flac", GetParam()); | |
226 } | |
227 #endif // defined(USE_PROPRIETARY_CODECS) | 223 #endif // defined(USE_PROPRIETARY_CODECS) |
228 #endif // defined(OS_CHROMEOS) | 224 #endif // defined(OS_CHROMEOS) |
229 | 225 |
| 226 IN_PROC_BROWSER_TEST_P(MediaTest, AudioBearFlac) { |
| 227 PlayAudio("bear.flac", GetParam()); |
| 228 } |
230 | 229 |
231 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavAlaw) { | 230 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavAlaw) { |
232 PlayAudio("bear_alaw.wav", GetParam()); | 231 PlayAudio("bear_alaw.wav", GetParam()); |
233 } | 232 } |
234 | 233 |
235 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) { | 234 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) { |
236 PlayAudio("bear_mulaw.wav", GetParam()); | 235 PlayAudio("bear_mulaw.wav", GetParam()); |
237 } | 236 } |
238 | 237 |
239 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { | 238 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { |
(...skipping 16 matching lines...) Expand all Loading... |
256 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { | 255 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { |
257 PlayVideo("bear.webm", false); | 256 PlayVideo("bear.webm", false); |
258 NavigateToURL(shell(), GURL(url::kAboutBlankURL)); | 257 NavigateToURL(shell(), GURL(url::kAboutBlankURL)); |
259 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); | 258 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); |
260 } | 259 } |
261 | 260 |
262 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); | 261 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); |
263 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); | 262 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); |
264 | 263 |
265 } // namespace content | 264 } // namespace content |
OLD | NEW |