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

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

Issue 12209016: Allow macros in parametrized browser tests (IN_PROCESS_BROWSER_TEST_P). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years, 10 months 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 | « no previous file | content/public/test/browser_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/encrypted_media_browsertest.cc
diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc
index 19560408714ca0bf57f818215ed87c639e695366..ff92fdf0a0adc05c64f47e9b2d0bb0035e34c2c8 100644
--- a/content/browser/media/encrypted_media_browsertest.cc
+++ b/content/browser/media/encrypted_media_browsertest.cc
@@ -160,11 +160,14 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoClearAudio) {
GetParam(), kExpected));
}
-#if !defined(OS_LINUX)
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) {
+#if defined(OS_LINUX)
+#define MAYBE_FrameChangeVideo DISABLED_FrameChangeVideo
+#else
+#define MAYBE_FrameChangeVideo FrameChangeVideo
+#endif
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameChangeVideo) {
const string16 kExpected = ASCIIToUTF16("ENDED");
ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected));
}
-#endif
} // namespace content
« no previous file with comments | « no previous file | content/public/test/browser_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698