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/stringprintf.h" | 7 #include "base/strings/stringprintf.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/common/url_constants.h" | 10 #include "content/public/common/url_constants.h" |
11 #include "content/public/test/browser_test_utils.h" | 11 #include "content/public/test/browser_test_utils.h" |
12 #include "content/shell/shell.h" | 12 #include "content/shell/browser/shell.h" |
13 #include "content/test/content_browser_test_utils.h" | 13 #include "content/test/content_browser_test_utils.h" |
14 | 14 |
15 // TODO(wolenetz): Fix Media.YUV* tests on MSVS 2012 x64. crbug.com/180074 | 15 // TODO(wolenetz): Fix Media.YUV* tests on MSVS 2012 x64. crbug.com/180074 |
16 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) && _MSC_VER == 1700 | 16 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) && _MSC_VER == 1700 |
17 #define MAYBE(x) DISABLED_##x | 17 #define MAYBE(x) DISABLED_##x |
18 #else | 18 #else |
19 #define MAYBE(x) x | 19 #define MAYBE(x) x |
20 #endif | 20 #endif |
21 | 21 |
22 namespace content { | 22 namespace content { |
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
236 } | 236 } |
237 | 237 |
238 #if defined(OS_CHROMEOS) | 238 #if defined(OS_CHROMEOS) |
239 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { | 239 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { |
240 RunColorFormatTest("yuv420p.avi", "ENDED"); | 240 RunColorFormatTest("yuv420p.avi", "ENDED"); |
241 } | 241 } |
242 #endif | 242 #endif |
243 #endif | 243 #endif |
244 | 244 |
245 } // namespace content | 245 } // namespace content |
OLD | NEW |