| Index: content/renderer/renderer_blink_platform_impl.cc
|
| diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
|
| index 8c2fb0c75f70950e0b45c71a85481657757b65b5..539cecbc5206c78e53ed2e62f64a2bb7f65d7af9 100644
|
| --- a/content/renderer/renderer_blink_platform_impl.cc
|
| +++ b/content/renderer/renderer_blink_platform_impl.cc
|
| @@ -78,7 +78,6 @@
|
| #include "ipc/ipc_sync_message_filter.h"
|
| #include "media/audio/audio_output_device.h"
|
| #include "media/base/audio_hardware_config.h"
|
| -#include "media/base/key_systems.h"
|
| #include "media/base/mime_util.h"
|
| #include "media/blink/webcontentdecryptionmodule_impl.h"
|
| #include "media/filters/stream_parser_factory.h"
|
| @@ -192,8 +191,7 @@ class RendererBlinkPlatformImpl::MimeRegistry
|
| public:
|
| blink::WebMimeRegistry::SupportsType supportsMediaMIMEType(
|
| const blink::WebString& mime_type,
|
| - const blink::WebString& codecs,
|
| - const blink::WebString& key_system) override;
|
| + const blink::WebString& codecs) override;
|
| bool supportsMediaSourceMIMEType(const blink::WebString& mime_type,
|
| const blink::WebString& codecs) override;
|
| blink::WebString mimeTypeForExtension(
|
| @@ -454,31 +452,9 @@ WebFileSystem* RendererBlinkPlatformImpl::fileSystem() {
|
| WebMimeRegistry::SupportsType
|
| RendererBlinkPlatformImpl::MimeRegistry::supportsMediaMIMEType(
|
| const WebString& mime_type,
|
| - const WebString& codecs,
|
| - const WebString& key_system) {
|
| + const WebString& codecs) {
|
| const std::string mime_type_ascii = ToASCIIOrEmpty(mime_type);
|
|
|
| - if (!key_system.isEmpty()) {
|
| - // Check whether the key system is supported with the mime_type and codecs.
|
| -
|
| - // Chromium only supports ASCII parameters.
|
| - if (!base::IsStringASCII(key_system))
|
| - return IsNotSupported;
|
| -
|
| - std::string key_system_ascii =
|
| - media::GetUnprefixedKeySystemName(base::UTF16ToASCII(
|
| - base::StringPiece16(key_system)));
|
| - std::vector<std::string> codec_vector;
|
| - media::ParseCodecString(ToASCIIOrEmpty(codecs), &codec_vector, true);
|
| -
|
| - if (!media::PrefixedIsSupportedKeySystemWithMediaMimeType(
|
| - mime_type_ascii, codec_vector, key_system_ascii)) {
|
| - return IsNotSupported;
|
| - }
|
| -
|
| - // Continue processing the mime_type and codecs.
|
| - }
|
| -
|
| std::vector<std::string> codec_vector;
|
| media::ParseCodecString(ToASCIIOrEmpty(codecs), &codec_vector, false);
|
| return static_cast<WebMimeRegistry::SupportsType>(
|
|
|