Reland r262568 "Encrypted Media: Check container mime type in MediaDrmBridge".

chrome/renderer/media/chrome_key_systems.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 "chrome/renderer/media/chrome_key_systems.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
@@ skipping 274 matching lines @@
   if (IsWidevineHrSupported())
     AddWidevineWithCodecs(WIDEVINE_HR, supported_codecs, concrete_key_systems);
 }
 #elif defined(OS_ANDROID)
 static void AddAndroidWidevine(
     std::vector<KeySystemInfo>* concrete_key_systems) {
   SupportedKeySystemRequest request;
   SupportedKeySystemResponse response;
 
   request.key_system = kWidevineKeySystem;
-#if defined(USE_PROPRIETARY_CODECS)
   request.codecs = static_cast<android::SupportedCodecs>(
-      android::MP4_AAC | android::MP4_AVC1);
-#endif  // defined(USE_PROPRIETARY_CODECS)
+      android::WEBM_VP8_AND_VORBIS | android::MP4_AAC | android::MP4_AVC1);
   content::RenderThread::Get()->Send(
       new ChromeViewHostMsg_GetSupportedKeySystems(request, &response));
   DCHECK_EQ(response.compositing_codecs >> 3, 0) << "unrecognized codec";
   DCHECK_EQ(response.non_compositing_codecs >> 3, 0) << "unrecognized codec";
   if (response.compositing_codecs != android::NO_SUPPORTED_CODECS) {
     AddWidevineWithCodecs(
         WIDEVINE,
         static_cast<SupportedCodecs>(response.compositing_codecs),
         concrete_key_systems);
   }
@@ skipping 14 matching lines @@
 #endif
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 #if defined(ENABLE_PEPPER_CDMS)
   AddPepperBasedWidevine(key_systems_info);
 #elif defined(OS_ANDROID)
   AddAndroidWidevine(key_systems_info);
 #endif
 #endif
 }