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

Unified Diff: content/browser/encrypted_media_browsertest.cc

Issue 12049068: Disable FrameChangeVideo properly (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/encrypted_media_browsertest.cc
diff --git a/content/browser/encrypted_media_browsertest.cc b/content/browser/encrypted_media_browsertest.cc
index fda0954b4472e386206b445475627a696ca003a9..e0eeee948d60bb417253da13806be5bb1aa2e663 100644
--- a/content/browser/encrypted_media_browsertest.cc
+++ b/content/browser/encrypted_media_browsertest.cc
@@ -164,15 +164,12 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoClearAudio) {
GetParam(), kExpected));
}
-#if defined(OS_WIN)
+#if !defined(OS_WIN)
// Times out on Windows. http://crbug.com/171937
-#define MAYBE_FrameChangeVideo DISABLED_FrameChangeVideo
-#else
-#define MAYBE_FrameChangeVideo FrameChangeVideo
-#endif
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameChangeVideo) {
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) {
const string16 kExpected = ASCIIToUTF16("ENDED");
ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected));
}
+#endif
} // namespace content
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698