| 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 aec21653d945f463ac3ae2ccaa1bfe683afe3811..019f3d21cfb501fe02c4346a18d741b82cab5599 100644
|
| --- a/content/browser/media/encrypted_media_browsertest.cc
|
| +++ b/content/browser/media/encrypted_media_browsertest.cc
|
| @@ -206,7 +206,14 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
|
| TestConfigChange();
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
|
| +#if defined(OS_ANDROID)
|
| +// Flaky on android: https://crbug.com/655630
|
| +#define MAYBE_FrameSizeChangeVideo DISABLED_FrameSizeChangeVideo
|
| +#else
|
| +#define MAYBE_FrameSizeChangeVideo FrameSizeChangeVideo
|
| +#endif
|
| +
|
| +IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameSizeChangeVideo) {
|
| TestFrameSizeChange();
|
| }
|
| #endif // !defined(DISABLE_ENCRYPTED_MEDIA_PLAYBACK_TESTS)
|
|
|