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/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "content/public/browser/web_contents.h" | 9 #include "content/public/browser/web_contents.h" |
10 #include "content/public/test/browser_test_utils.h" | 10 #include "content/public/test/browser_test_utils.h" |
11 #include "content/public/test/content_browser_test_utils.h" | 11 #include "content/public/test/content_browser_test_utils.h" |
12 #include "content/shell/browser/shell.h" | 12 #include "content/shell/browser/shell.h" |
13 #include "media/base/test_data_util.h" | 13 #include "media/base/test_data_util.h" |
14 #include "net/test/spawned_test_server/spawned_test_server.h" | 14 #include "net/test/spawned_test_server/spawned_test_server.h" |
15 | 15 |
16 // TODO(wolenetz): Fix Media.YUV* tests on MSVS 2012 x64. crbug.com/180074 | |
17 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) && _MSC_VER == 1700 | |
18 #define MAYBE(x) DISABLED_##x | |
19 #else | |
20 #define MAYBE(x) x | |
21 #endif | |
22 | |
23 namespace content { | 16 namespace content { |
24 | 17 |
25 // Common test results. | 18 // Common test results. |
26 const char MediaBrowserTest::kEnded[] = "ENDED"; | 19 const char MediaBrowserTest::kEnded[] = "ENDED"; |
27 const char MediaBrowserTest::kError[] = "ERROR"; | 20 const char MediaBrowserTest::kError[] = "ERROR"; |
28 const char MediaBrowserTest::kFailed[] = "FAILED"; | 21 const char MediaBrowserTest::kFailed[] = "FAILED"; |
29 | 22 |
30 void MediaBrowserTest::RunMediaTestPage(const std::string& html_page, | 23 void MediaBrowserTest::RunMediaTestPage(const std::string& html_page, |
31 const base::StringPairs& query_params, | 24 const base::StringPairs& query_params, |
32 const std::string& expected_title, | 25 const std::string& expected_title, |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 // Covers tear-down when navigating away as opposed to browser exiting. | 224 // Covers tear-down when navigating away as opposed to browser exiting. |
232 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { | 225 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { |
233 PlayVideo("bear.ogv", false); | 226 PlayVideo("bear.ogv", false); |
234 NavigateToURL(shell(), GURL(url::kAboutBlankURL)); | 227 NavigateToURL(shell(), GURL(url::kAboutBlankURL)); |
235 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); | 228 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); |
236 } | 229 } |
237 | 230 |
238 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); | 231 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); |
239 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); | 232 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); |
240 | 233 |
241 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pTheora)) { | 234 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pTheora) { |
242 RunColorFormatTest("yuv420p.ogv", kEnded); | 235 RunColorFormatTest("yuv420p.ogv", kEnded); |
243 } | 236 } |
244 | 237 |
245 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv422pTheora)) { | 238 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv422pTheora) { |
246 RunColorFormatTest("yuv422p.ogv", kEnded); | 239 RunColorFormatTest("yuv422p.ogv", kEnded); |
247 } | 240 } |
248 | 241 |
249 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pTheora)) { | 242 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv444pTheora) { |
250 RunColorFormatTest("yuv444p.ogv", kEnded); | 243 RunColorFormatTest("yuv444p.ogv", kEnded); |
251 } | 244 } |
252 | 245 |
253 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pVp8)) { | 246 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pVp8) { |
254 RunColorFormatTest("yuv420p.webm", kEnded); | 247 RunColorFormatTest("yuv420p.webm", kEnded); |
255 } | 248 } |
256 | 249 |
257 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pVp9)) { | 250 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv444pVp9) { |
258 RunColorFormatTest("yuv444p.webm", "ENDED"); | 251 RunColorFormatTest("yuv444p.webm", "ENDED"); |
259 } | 252 } |
260 | 253 |
261 #if defined(USE_PROPRIETARY_CODECS) | 254 #if defined(USE_PROPRIETARY_CODECS) |
262 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pH264)) { | 255 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pH264) { |
263 RunColorFormatTest("yuv420p.mp4", kEnded); | 256 RunColorFormatTest("yuv420p.mp4", kEnded); |
264 } | 257 } |
265 | 258 |
266 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuvj420pH264)) { | 259 IN_PROC_BROWSER_TEST_F(MediaTest, Yuvj420pH264) { |
267 RunColorFormatTest("yuvj420p.mp4", kEnded); | 260 RunColorFormatTest("yuvj420p.mp4", kEnded); |
268 } | 261 } |
269 | 262 |
270 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv422pH264)) { | 263 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv422pH264) { |
271 RunColorFormatTest("yuv422p.mp4", kEnded); | 264 RunColorFormatTest("yuv422p.mp4", kEnded); |
272 } | 265 } |
273 | 266 |
274 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pH264)) { | 267 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv444pH264) { |
275 RunColorFormatTest("yuv444p.mp4", kEnded); | 268 RunColorFormatTest("yuv444p.mp4", kEnded); |
276 } | 269 } |
277 | 270 |
278 #if defined(OS_CHROMEOS) | 271 #if defined(OS_CHROMEOS) |
279 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { | 272 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { |
280 RunColorFormatTest("yuv420p.avi", kEnded); | 273 RunColorFormatTest("yuv420p.avi", kEnded); |
281 } | 274 } |
282 #endif // defined(OS_CHROMEOS) | 275 #endif // defined(OS_CHROMEOS) |
283 #endif // defined(USE_PROPRIETARY_CODECS) | 276 #endif // defined(USE_PROPRIETARY_CODECS) |
284 | 277 |
285 } // namespace content | 278 } // namespace content |
OLD | NEW |