Revert 227565 "Enable EncryptedMediaTest (in content_browsertest..."

trunk/src/content/browser/media/encrypted_media_browsertest.cc

Index: trunk/src/content/browser/media/encrypted_media_browsertest.cc
===================================================================
--- trunk/src/content/browser/media/encrypted_media_browsertest.cc	(revision 227626)
+++ trunk/src/content/browser/media/encrypted_media_browsertest.cc	(working copy)
@@ -104,18 +104,10 @@
 #endif
 };
 
-using ::testing::Combine;
-using ::testing::Values;
+INSTANTIATE_TEST_CASE_P(ClearKey, EncryptedMediaTest,
+    ::testing::Combine(
+        ::testing::Values(kClearKeyKeySystem), ::testing::Values(SRC, MSE)));
 
-#if !defined(OS_ANDROID)
-// Encrypted media playback with SRC is not supported on Android.
-INSTANTIATE_TEST_CASE_P(SRC_ClearKey, EncryptedMediaTest,
-                        Combine(Values(kClearKeyKeySystem), Values(SRC)));
-#endif  // defined(OS_ANDROID)
-
-INSTANTIATE_TEST_CASE_P(MSE_ClearKey, EncryptedMediaTest,
-                        Combine(Values(kClearKeyKeySystem), Values(MSE)));
-
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM) {
   TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly);
 }
@@ -151,7 +143,7 @@
 
 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) {
   RunEncryptedMediaTest("encrypted_media_player.html", "bear-a-enc_a.webm",
-                        kWebMAudioOnly, "com.example.foo", MSE,
+                        kWebMAudioOnly, "com.example.foo", SRC,
                         kEmeGkrException);
 }