Commit 369798c4 authored by Patrick Noland's avatar Patrick Noland Committed by Commit Bot

Disable EncryptedMediaTest on Android

Bug: 1099384
Change-Id: I90d009400e38446ed658c9dda112a9179601b0d9
Tbr: chcunningham@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2268019Reviewed-by: default avatarPatrick Noland <pnoland@chromium.org>
Commit-Queue: Patrick Noland <pnoland@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782648}
parent be9df3ef
......@@ -115,7 +115,14 @@ enum class ConfigChangeType {
enum class PlayCount { ONCE, TWICE };
// Base class for encrypted media tests.
class EncryptedMediaTestBase : public MediaBrowserTest {
#if defined(OS_ANDROID)
// Flaky on Android: https://crbug.com/1099384
#define MAYBE_EncryptedMediaTestBase DISABLED_EncryptedMediaTestBase
#else
#define MAYBE_EncryptedMediaTestBase EncryptedMediaTestBase
#endif
class MAYBE_EncryptedMediaTestBase : public MediaBrowserTest {
public:
bool IsExternalClearKey(const std::string& key_system) {
if (key_system == kExternalClearKeyKeySystem)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment