| 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
|
|
|