Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(587)

Unified Diff: content/browser/media/media_browsertest.cc

Issue 798163004: remove some dead visual studio < 2013 code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove MAYBE macro completely Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/crash/app/hard_error_handler_win.cc ('k') | device/bluetooth/bluetooth_init_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/media_browsertest.cc
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
index 46f7a49b618867bfe9ed224022ce21a7a0ad5505..7442c477a472e67af94f1113f8487a90090a0320 100644
--- a/content/browser/media/media_browsertest.cc
+++ b/content/browser/media/media_browsertest.cc
@@ -13,13 +13,6 @@
#include "media/base/test_data_util.h"
#include "net/test/spawned_test_server/spawned_test_server.h"
-// TODO(wolenetz): Fix Media.YUV* tests on MSVS 2012 x64. crbug.com/180074
-#if defined(OS_WIN) && defined(ARCH_CPU_X86_64) && _MSC_VER == 1700
-#define MAYBE(x) DISABLED_##x
-#else
-#define MAYBE(x) x
-#endif
-
namespace content {
// Common test results.
@@ -238,40 +231,40 @@ IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) {
INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false));
INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true));
-IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pTheora)) {
+IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pTheora) {
RunColorFormatTest("yuv420p.ogv", kEnded);
}
-IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv422pTheora)) {
+IN_PROC_BROWSER_TEST_F(MediaTest, Yuv422pTheora) {
RunColorFormatTest("yuv422p.ogv", kEnded);
}
-IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pTheora)) {
+IN_PROC_BROWSER_TEST_F(MediaTest, Yuv444pTheora) {
RunColorFormatTest("yuv444p.ogv", kEnded);
}
-IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pVp8)) {
+IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pVp8) {
RunColorFormatTest("yuv420p.webm", kEnded);
}
-IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pVp9)) {
+IN_PROC_BROWSER_TEST_F(MediaTest, Yuv444pVp9) {
RunColorFormatTest("yuv444p.webm", "ENDED");
}
#if defined(USE_PROPRIETARY_CODECS)
-IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pH264)) {
+IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pH264) {
RunColorFormatTest("yuv420p.mp4", kEnded);
}
-IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuvj420pH264)) {
+IN_PROC_BROWSER_TEST_F(MediaTest, Yuvj420pH264) {
RunColorFormatTest("yuvj420p.mp4", kEnded);
}
-IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv422pH264)) {
+IN_PROC_BROWSER_TEST_F(MediaTest, Yuv422pH264) {
RunColorFormatTest("yuv422p.mp4", kEnded);
}
-IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pH264)) {
+IN_PROC_BROWSER_TEST_F(MediaTest, Yuv444pH264) {
RunColorFormatTest("yuv444p.mp4", kEnded);
}
« no previous file with comments | « components/crash/app/hard_error_handler_win.cc ('k') | device/bluetooth/bluetooth_init_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698