media: Enable Opus tests on Android in content EncryptedMediaTest

content/browser/media/encrypted_media_browsertest.cc

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 697f33dfff94d1cd998cafe13be3e7efcde98471..114983418c2b2f9614d65e37a8b0895607227bac 100644
--- a/content/browser/media/encrypted_media_browsertest.cc
+++ b/content/browser/media/encrypted_media_browsertest.cc
@@ -12,6 +12,7 @@
 #include "content/shell/browser/shell.h"
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
+#include "media/base/media.h"
 #endif
 
 // Available key systems.
@@ -166,25 +167,25 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) {
 }
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM_Opus) {
-  // Opus is not supported on Android. http://crbug.com/318436
 #if defined(OS_ANDROID)
-  return;
+  if (!media::PlatformHasOpusSupport())
+    return;
 #endif
   TestSimplePlayback("bear-320x240-opus-a_enc-a.webm", kWebMAudioOnly);
 }
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM_Opus) {
-  // Opus is not supported on Android. http://crbug.com/318436
 #if defined(OS_ANDROID)
-  return;
+  if (!media::PlatformHasOpusSupport())
+    return;
 #endif
   TestSimplePlayback("bear-320x240-opus-av_enc-av.webm", kWebMAudioVideo);
 }
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM_Opus) {
-  // Opus is not supported on Android. http://crbug.com/318436
 #if defined(OS_ANDROID)
-  return;
+  if (!media::PlatformHasOpusSupport())
+    return;
 #endif
   TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMAudioVideo);
 }