| 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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 PlayVideo("bear_h264_aac.3gp", GetParam()); | 202 PlayVideo("bear_h264_aac.3gp", GetParam()); |
| 203 } | 203 } |
| 204 | 204 |
| 205 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear3gpAmrnbMpeg4) { | 205 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear3gpAmrnbMpeg4) { |
| 206 PlayVideo("bear_mpeg4_amrnb.3gp", GetParam()); | 206 PlayVideo("bear_mpeg4_amrnb.3gp", GetParam()); |
| 207 } | 207 } |
| 208 | 208 |
| 209 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) { | 209 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) { |
| 210 PlayAudio("bear_gsm_ms.wav", GetParam()); | 210 PlayAudio("bear_gsm_ms.wav", GetParam()); |
| 211 } | 211 } |
| 212 | |
| 213 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) { | |
| 214 PlayAudio("bear.flac", GetParam()); | |
| 215 } | |
| 216 #endif // defined(USE_PROPRIETARY_CODECS) | 212 #endif // defined(USE_PROPRIETARY_CODECS) |
| 217 #endif // defined(OS_CHROMEOS) | 213 #endif // defined(OS_CHROMEOS) |
| 218 | 214 |
| 215 IN_PROC_BROWSER_TEST_P(MediaTest, AudioBearFlac) { |
| 216 PlayAudio("bear.flac", GetParam()); |
| 217 } |
| 219 | 218 |
| 220 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavAlaw) { | 219 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavAlaw) { |
| 221 PlayAudio("bear_alaw.wav", GetParam()); | 220 PlayAudio("bear_alaw.wav", GetParam()); |
| 222 } | 221 } |
| 223 | 222 |
| 224 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) { | 223 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) { |
| 225 PlayAudio("bear_mulaw.wav", GetParam()); | 224 PlayAudio("bear_mulaw.wav", GetParam()); |
| 226 } | 225 } |
| 227 | 226 |
| 228 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { | 227 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 245 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { | 244 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { |
| 246 PlayVideo("bear.webm", false); | 245 PlayVideo("bear.webm", false); |
| 247 NavigateToURL(shell(), GURL(url::kAboutBlankURL)); | 246 NavigateToURL(shell(), GURL(url::kAboutBlankURL)); |
| 248 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); | 247 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); |
| 249 } | 248 } |
| 250 | 249 |
| 251 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); | 250 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); |
| 252 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); | 251 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); |
| 253 | 252 |
| 254 } // namespace content | 253 } // namespace content |
| OLD | NEW |