Enable EncryptedMediaTest (in content_browsertests) on Android.

content/browser/media/encrypted_media_browsertest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "content/browser/media/media_browsertest.h"
 #include "content/public/common/content_switches.h"
@@ skipping 81 matching lines @@
   }
 
 #if defined(OS_ANDROID)
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(
         switches::kDisableGestureRequirementForMediaPlayback);
   }
 #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);
 }
 
 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) {
   TestMSESimplePlayback("bear-320x240-av-enc_av.webm", kWebMAudioVideo,
                         "com.example.invalid", kEmeGkrException);
 }
 
@@ skipping 24 matching lines @@
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) {
   // Times out on Windows XP. http://crbug.com/171937
 #if defined(OS_WIN)
   if (base::win::GetVersion() < base::win::VERSION_VISTA)
     return;
 #endif
   TestFrameSizeChange(GetParam(), kEnded);
 }
 
 // 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