media: Remove Vorbis from secure decoder list for Widevine.

chrome/common/chrome_content_client.cc

 // Copyright (c) 2012 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/common/chrome_content_client.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
@@ skipping 154 matching lines @@
       widevine_cdm.description = kWidevineCdmDescription +
                                  std::string(" (version: ") +
                                  WIDEVINE_CDM_VERSION_STRING + ")";
       widevine_cdm.version = WIDEVINE_CDM_VERSION_STRING;
       content::WebPluginMimeType widevine_cdm_mime_type(
           kWidevineCdmPluginMimeType,
           kWidevineCdmPluginExtension,
           kWidevineCdmPluginMimeTypeDescription);
 
       // Add the supported codecs as if they came from the component manifest.
       std::vector<std::string> codecs;

[ddorwin, 2016/02/12 18:47:35]

// This list must match the CDM that is being bundled with Chrome.

[xhwang, 2016/02/12 20:37:21]

Done.

-      codecs.push_back(kCdmSupportedCodecVorbis);
       codecs.push_back(kCdmSupportedCodecVp8);
       codecs.push_back(kCdmSupportedCodecVp9);
 #if defined(USE_PROPRIETARY_CODECS)
       codecs.push_back(kCdmSupportedCodecAac);
       codecs.push_back(kCdmSupportedCodecAvc1);
 #endif  // defined(USE_PROPRIETARY_CODECS)
       std::string codec_string = base::JoinString(
           codecs, std::string(1, kCdmSupportedCodecsValueDelimiter));
       widevine_cdm_mime_type.additional_param_names.push_back(
           base::ASCIIToUTF16(kCdmSupportedCodecsParamName));
@@ skipping 443 matching lines @@
 #endif
 }
 
 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() {
 #if defined(ENABLE_EXTENSIONS)
   return extensions::IsIsolateExtensionsEnabled();
 #else
   return false;
 #endif
 }