| 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 af786a4f47d9ca8dc21e654d0fd2015549da9716..7ae13c2b01e5ba890dfa907f76e48c7c4dc841d3 100644
|
| --- a/chrome/browser/media/encrypted_media_browsertest.cc
|
| +++ b/chrome/browser/media/encrypted_media_browsertest.cc
|
| @@ -513,12 +513,13 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
|
| TestConfigChange();
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
|
| - // Times out on Windows XP. http://crbug.com/171937
|
| +// Flaky on Windows. http://crbug.com/655630
|
| #if defined(OS_WIN)
|
| - if (base::win::GetVersion() < base::win::VERSION_VISTA)
|
| - return;
|
| +#define MAYBE_FrameSizeChangeVideo DISABLED_FrameSizeChangeVideo
|
| +#else
|
| +#define MAYBE_FrameSizeChangeVideo FrameSizeChangeVideo
|
| #endif
|
| +IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameSizeChangeVideo) {
|
| if (!IsPlayBackPossible(CurrentKeySystem())) {
|
| DVLOG(0) << "Skipping test - FrameSizeChange test requires video playback.";
|
| return;
|
|
|