| Index: chrome/browser/media/encrypted_media_browsertest.cc
|
| diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
|
| index 4c7fbb6273194b4b9817dc31a0668fd7d549cab3..93d4710081fcce1db9cb497eeeb51d83b39b2bc4 100644
|
| --- a/chrome/browser/media/encrypted_media_browsertest.cc
|
| +++ b/chrome/browser/media/encrypted_media_browsertest.cc
|
| @@ -515,13 +515,7 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
|
| TestConfigChange();
|
| }
|
|
|
| -// Flaky on Windows. http://crbug.com/655630
|
| -#if defined(OS_WIN)
|
| -#define MAYBE_FrameSizeChangeVideo DISABLED_FrameSizeChangeVideo
|
| -#else
|
| -#define MAYBE_FrameSizeChangeVideo FrameSizeChangeVideo
|
| -#endif
|
| -IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameSizeChangeVideo) {
|
| +IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
|
| if (!IsPlayBackPossible(CurrentKeySystem())) {
|
| DVLOG(0) << "Skipping test - FrameSizeChange test requires video playback.";
|
| return;
|
|
|