| 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 c049d307cad0ed660ae081b4a75ee91734582dfc..1069537f5149eec03ca8976c285b48396902c96d 100644
|
| --- a/content/browser/media/encrypted_media_browsertest.cc
|
| +++ b/content/browser/media/encrypted_media_browsertest.cc
|
| @@ -92,6 +92,10 @@ class EncryptedMediaTest : public content::MediaBrowserTest,
|
| const std::string& key_system,
|
| SrcType src_type,
|
| const std::string& expectation) {
|
| +#if defined(OS_ANDROID) && defined(__aarch64__)
|
| + // Disable EME tests on arm64 due to timeouts: http://crbug.com/418039
|
| + return;
|
| +#endif
|
| if (src_type == MSE && !IsMSESupported()) {
|
| VLOG(0) << "Skipping test - MSE not supported.";
|
| return;
|
| @@ -175,9 +179,6 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
|
| #if defined(OS_WIN)
|
| if (base::win::GetVersion() < base::win::VERSION_VISTA)
|
| return;
|
| -#elif defined(__aarch64__)
|
| - // Times out on arm64 currently due to http://crbug.com/403308
|
| - return;
|
| #endif
|
| TestFrameSizeChange();
|
| }
|
|
|