| 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 019f3d21cfb501fe02c4346a18d741b82cab5599..63608d523c89f3e81ed03e071caaba06b19b11d4 100644
|
| --- a/content/browser/media/encrypted_media_browsertest.cc
|
| +++ b/content/browser/media/encrypted_media_browsertest.cc
|
| @@ -206,12 +206,7 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
|
| TestConfigChange();
|
| }
|
|
|
| -#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();
|
|
|