Update mp4 vp9 test files to follow v1.0 spec

chrome/browser/media/encrypted_media_supported_types_browsertest.cc

 // Copyright 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 <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "base/base_switches.h"
@@ skipping 431 matching lines @@
       kAudioWebMMimeType, audio_mp4_codecs(), kClearKey));
   EXPECT_NO_MATCH(AreCodecsSupportedByKeySystem(
       kAudioWebMMimeType, video_mp4_codecs(), kClearKey));
 }
 
 IN_PROC_BROWSER_TEST_F(EncryptedMediaSupportedTypesClearKeyTest, Video_MP4) {
   // Valid video types.
   EXPECT_PROPRIETARY(AreCodecsSupportedByKeySystem(
       kVideoMP4MimeType, video_mp4_codecs(), kClearKey));
   EXPECT_SUCCESS(AreCodecsSupportedByKeySystem(
-      kVideoWebMMimeType, video_common_codecs(), kClearKey));
+      kVideoMP4MimeType, video_common_codecs(), kClearKey));
 
   // High 10-bit Profile is supported when using ClearKey if
   // it is supported for clear content on this platform.
 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(OS_ANDROID)
   EXPECT_PROPRIETARY(AreCodecsSupportedByKeySystem(
       kVideoMP4MimeType, video_mp4_hi10p_codecs(), kClearKey));
 #else
   EXPECT_NO_MATCh(AreCodecsSupportedByKeySystem(
       kVideoMP4MimeType, video_mp4_hi10p_codecs(), kClearKey));
 #endif
@@ skipping 129 matching lines @@
   EXPECT_ECK_NO_MATCH(AreCodecsSupportedByKeySystem(
       kAudioWebMMimeType, video_mp4_codecs(), kExternalClearKey));
 }
 
 IN_PROC_BROWSER_TEST_F(EncryptedMediaSupportedTypesExternalClearKeyTest,
                        Video_MP4) {
   // Valid video types.
   EXPECT_ECK_PROPRIETARY(AreCodecsSupportedByKeySystem(
       kVideoMP4MimeType, video_mp4_codecs(), kExternalClearKey));
   EXPECT_ECK(AreCodecsSupportedByKeySystem(
       kVideoWebMMimeType, video_common_codecs(), kExternalClearKey));

[xhwang, 2017/05/04 22:20:02]

fix me too!

[kqyang, 2017/05/04 23:06:14]

Good catch. Done.

 
   // High 10-bit Profile is not supported when using ExternalClearKey.
   EXPECT_ECK_NO_MATCH(AreCodecsSupportedByKeySystem(
       kVideoMP4MimeType, video_mp4_hi10p_codecs(), kExternalClearKey));
 
   // Non-video MP4 codecs.
   EXPECT_ECK_NO_MATCH(AreCodecsSupportedByKeySystem(
       kVideoMP4MimeType, audio_mp4_codecs(), kExternalClearKey));
 
   // Invalid or non-MP4 codecs.
@@ skipping 98 matching lines @@
       kAudioWebMMimeType, audio_mp4_codecs(), kWidevine));
   EXPECT_WV_NO_MATCH(AreCodecsSupportedByKeySystem(
       kAudioWebMMimeType, video_mp4_codecs(), kWidevine));
 }
 
 IN_PROC_BROWSER_TEST_F(EncryptedMediaSupportedTypesWidevineTest, Video_MP4) {
   // Valid video types.
   EXPECT_WV_PROPRIETARY(AreCodecsSupportedByKeySystem(
       kVideoMP4MimeType, video_mp4_codecs(), kWidevine));
   EXPECT_WV_SUCCESS(AreCodecsSupportedByKeySystem(
       kVideoWebMMimeType, video_common_codecs(), kWidevine));

[xhwang, 2017/05/04 22:20:01]

fix me too!

[kqyang, 2017/05/04 23:06:14]

Done.

 
   // High 10-bit Profile is not supported when using Widevine.
   EXPECT_WV_NO_MATCH(AreCodecsSupportedByKeySystem(
       kVideoMP4MimeType, video_mp4_hi10p_codecs(), kWidevine));
 
   // Non-video MP4 codecs.
   EXPECT_WV_NO_MATCH(AreCodecsSupportedByKeySystem(
       kVideoMP4MimeType, audio_mp4_codecs(), kWidevine));
 
   // Invalid or non-MP4 codecs.
@@ skipping 66 matching lines @@
       kVideoWebMMimeType, video_webm_codecs(), kWidevine));
 
   // Clear Key should still be registered.
   EXPECT_SUCCESS(AreCodecsSupportedByKeySystem(kVideoWebMMimeType,
                                                video_webm_codecs(), kClearKey));
 }
 #endif  // !defined(WIDEVINE_CDM_AVAILABLE)
 #endif  // BUILDFLAG(ENABLE_PEPPER_CDMS)
 
 }  // namespace chrome