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

> Enable EncryptedMediaTest (in content_browsertests) on Android.
> 
> Encrytped media playback with <video src=...> is not supported on Android. Those
> tests will not run on Android.
> 
> BUG=304956,300035
> TEST=This CL enables tests which was previously disabled.
> 
> Review URL: https://codereview.chromium.org/26243003

TBR=xhwang@chromium.org

Review URL: https://codereview.chromium.org/26565003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227627 0039d316-1c4b-4281-b951-d872f2087c98

build/android/pylib/gtest/filter/content_browsertests_disabled

@@ -2,10 +2,13 @@
 # Timeouts
 Http/MediaTest.*
 File/MediaTest.*
+ExternalClearKey/EncryptedMediaTest.*
+ClearKey/EncryptedMediaTest.*
 WorkerTest.*
 MediaTest.*
 WebGLConformanceTest.*
 MessagePortTest.Tests
+EncryptedMediaTest.*
 CrossPlatformAccessibilityBrowserTest.*
 DatabaseTest.*
 ResourceDispatcherHostBrowserTest.SyncXMLHttpRequest_DuringUnload

content/browser/media/encrypted_media_browsertest.cc

@@ -104,17 +104,9 @@ class EncryptedMediaTest : public content::MediaBrowserTest,
 #endif
 };
 
-using ::testing::Combine;
-using ::testing::Values;
-
-#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)));
+INSTANTIATE_TEST_CASE_P(ClearKey, EncryptedMediaTest,
+    ::testing::Combine(
+        ::testing::Values(kClearKeyKeySystem), ::testing::Values(SRC, 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_P(EncryptedMediaTest, FrameSizeChangeVideo) {
 
 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);
 }