Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / media / encrypted_media_browsertest.cc

diff --git a/src/chrome/browser/media/encrypted_media_browsertest.cc b/src/chrome/browser/media/encrypted_media_browsertest.cc
index 2a75620..875a003 100644 (file)
--- a/src/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/src/chrome/browser/media/encrypted_media_browsertest.cc
@@ -51,6 +51,7 @@ const char kExternalClearKeyCrashKeySystem[] =
 // Supported media types.
 const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\"";
 const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\"";
+const char kWebMVP9VideoOnly[] = "video/webm; codecs=\"vp9\"";
 const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\"";
 #if defined(USE_PROPRIETARY_CODECS)
 const char kMP4AudioOnly[] = "audio/mp4; codecs=\"mp4a.40.2\"";
@@ -507,22 +508,10 @@ INSTANTIATE_TEST_CASE_P(MSE_Widevine,
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM) {
-#if defined(WIDEVINE_CDM_AVAILABLE)
-  if (IsWidevine(CurrentKeySystem())) {
-    VLOG(0) << "Test disabled on Widevine key system, crbug.com/349526.";
-    return;
-  }
-#endif
   TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly);
 }
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioClearVideo_WebM) {
-#if defined(WIDEVINE_CDM_AVAILABLE)
-  if (IsWidevine(CurrentKeySystem())) {
-    VLOG(0) << "Test disabled on Widevine key system, crbug.com/349526.";
-    return;
-  }
-#endif
   TestSimplePlayback("bear-320x240-av-enc_a.webm", kWebMAudioVideo);
 }
 
@@ -538,6 +527,18 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) {
   TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo);
 }
 
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VP9Video_WebM) {
+#if defined(WIDEVINE_CDM_AVAILABLE)
+  // TODO(xhwang): Remove this once VP9 is supported by Widevine CDM.
+  // See http://crbug.com/361318.
+  if (IsWidevine(CurrentKeySystem())) {
+    VLOG(0) << "VP9 not supported in Widevine CDM.";
+    return;
+  }
+#endif
+  TestSimplePlayback("bear-320x240-v-vp9-enc_v.webm", kWebMVP9VideoOnly);
+}
+
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, InvalidResponseKeyError) {
   RunInvalidResponseTest();
 }
@@ -603,7 +604,7 @@ IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, ParentThrowsException_Prefixed) {
 
 // TODO(jrummell): http://crbug.com/349181
 // The parent key system cannot be used when creating MediaKeys.
-IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, DISABLED_ParentThrowsException) {
+IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, ParentThrowsException) {
   RunEncryptedMediaTest("encrypted_media_player.html",
                         "bear-a-enc_a.webm",
                         kWebMAudioOnly,