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 | 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 | 17 #define MAYBE(x) x |
scottmg
2014/12/13 20:11:02
remove this and the MAYBEs below too
Mostyn Bramley-Moore
2014/12/13 20:22:45
Done. I should have spotted that myself :)
| |
21 #endif | |
22 | 18 |
23 namespace content { | 19 namespace content { |
24 | 20 |
25 // Common test results. | 21 // Common test results. |
26 const char MediaBrowserTest::kEnded[] = "ENDED"; | 22 const char MediaBrowserTest::kEnded[] = "ENDED"; |
27 const char MediaBrowserTest::kError[] = "ERROR"; | 23 const char MediaBrowserTest::kError[] = "ERROR"; |
28 const char MediaBrowserTest::kFailed[] = "FAILED"; | 24 const char MediaBrowserTest::kFailed[] = "FAILED"; |
29 | 25 |
30 void MediaBrowserTest::RunMediaTestPage(const std::string& html_page, | 26 void MediaBrowserTest::RunMediaTestPage(const std::string& html_page, |
31 const base::StringPairs& query_params, | 27 const base::StringPairs& query_params, |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
276 } | 272 } |
277 | 273 |
278 #if defined(OS_CHROMEOS) | 274 #if defined(OS_CHROMEOS) |
279 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { | 275 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { |
280 RunColorFormatTest("yuv420p.avi", kEnded); | 276 RunColorFormatTest("yuv420p.avi", kEnded); |
281 } | 277 } |
282 #endif // defined(OS_CHROMEOS) | 278 #endif // defined(OS_CHROMEOS) |
283 #endif // defined(USE_PROPRIETARY_CODECS) | 279 #endif // defined(USE_PROPRIETARY_CODECS) |
284 | 280 |
285 } // namespace content | 281 } // namespace content |
OLD | NEW |