Enable EncryptedMediaTest (in content_browsertests) on Android.

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 8d163d4587c777a6111ca5158aeb8ba953ef6b6f..20df39e4b8f8fdb16344ea6c6690bece03eff77a 100644
--- a/content/browser/media/encrypted_media_browsertest.cc
+++ b/content/browser/media/encrypted_media_browsertest.cc
@@ -99,9 +99,17 @@ class EncryptedMediaTest : public content::MediaBrowserTest,
 #endif
 };
 
-INSTANTIATE_TEST_CASE_P(ClearKey, EncryptedMediaTest,
-    ::testing::Combine(
-        ::testing::Values(kClearKeyKeySystem), ::testing::Values(SRC, MSE)));
+using ::testing::Combine;
+using ::testing::Values;
+
+#if !defined(OS_ANDROID)
+// TODO(xhwang): Encrypted media playback with SRC is not supported on Android.

[ddorwin, 2013/10/07 21:46:22]

What are you planning "TODO" about this? IF nothing, maybe just remove it.

(Should the TODO be above 105?)

[xhwang, 2013/10/07 22:05:24]

Done.

+INSTANTIATE_TEST_CASE_P(SRC_ClearKey, EncryptedMediaTest,
+                        Combine(Values(kClearKeyKeySystem), Values(SRC)));
+#endif  // defined(OS_ANDROID)
+
+INSTANTIATE_TEST_CASE_P(MSE_ClearKey, EncryptedMediaTest,

[xhwang, 2013/10/07 21:41:23]

I prefix the tests with SRC/MSE so we can easily tell what the test is.
Previously we only get /0 /1 suffixes which is hard to read.

+                        Combine(Values(kClearKeyKeySystem), Values(MSE)));
 
 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, ConfigChangeVideo_ClearKey) {
   TestConfigChange(kClearKeyKeySystem, kEnded);
@@ -146,10 +154,13 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) {
 }
 
 // TODO(shadi): Do we need both this and InvalidKeySystem?
+#if !defined(OS_ANDROID)
+// TODO(xhwang): Encrypted media playback with SRC is not supported on Android.

[ddorwin, 2013/10/07 21:46:22]

Just change it to MSE. There's no real reason this is SRC other than that's
"simplest".

[xhwang, 2013/10/07 22:05:24]

Done.

 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) {
   RunEncryptedMediaTest("encrypted_media_player.html", "bear-a-enc_a.webm",
                         kWebMAudioOnly, "com.example.foo", SRC,
                         kEmeGkrException);
 }
+#endif  // !defined(OS_ANDROID)
 
 }  // namespace content