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 cf1f8174f59e229c135ed294f12648e0dac24272..d8454880520882f049c6617cf220a4af079b8761 100644 |
--- a/content/renderer/renderer_blink_platform_impl.cc |
+++ b/content/renderer/renderer_blink_platform_impl.cc |
@@ -62,9 +62,9 @@ |
#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" |
-#include "net/base/mime_util.h" |
#include "net/base/net_util.h" |
#include "storage/common/quota/quota_types.h" |
#include "third_party/WebKit/public/platform/WebBatteryStatusListener.h" |
@@ -409,7 +409,7 @@ RendererBlinkPlatformImpl::MimeRegistry::supportsMediaMIMEType( |
const WebString& key_system) { |
const std::string mime_type_ascii = ToASCIIOrEmpty(mime_type); |
// Not supporting the container is a flat-out no. |
- if (!net::IsSupportedMediaMimeType(mime_type_ascii)) |
+ if (!media::IsSupportedMediaMimeType(mime_type_ascii)) |
return IsNotSupported; |
if (!key_system.isEmpty()) { |
@@ -422,7 +422,7 @@ RendererBlinkPlatformImpl::MimeRegistry::supportsMediaMIMEType( |
std::string key_system_ascii = |
media::GetUnprefixedKeySystemName(base::UTF16ToASCII(key_system)); |
std::vector<std::string> strict_codecs; |
- net::ParseCodecString(ToASCIIOrEmpty(codecs), &strict_codecs, true); |
+ media::ParseCodecString(ToASCIIOrEmpty(codecs), &strict_codecs, true); |
if (!media::PrefixedIsSupportedKeySystemWithMediaMimeType( |
mime_type_ascii, strict_codecs, key_system_ascii)) { |
@@ -433,18 +433,18 @@ RendererBlinkPlatformImpl::MimeRegistry::supportsMediaMIMEType( |
} |
// Check list of strict codecs to see if it is supported. |
- if (net::IsStrictMediaMimeType(mime_type_ascii)) { |
+ if (media::IsStrictMediaMimeType(mime_type_ascii)) { |
// Check if the codecs are a perfect match. |
std::vector<std::string> strict_codecs; |
- net::ParseCodecString(ToASCIIOrEmpty(codecs), &strict_codecs, false); |
+ media::ParseCodecString(ToASCIIOrEmpty(codecs), &strict_codecs, false); |
return static_cast<WebMimeRegistry::SupportsType> ( |
- net::IsSupportedStrictMediaMimeType(mime_type_ascii, strict_codecs)); |
+ media::IsSupportedStrictMediaMimeType(mime_type_ascii, strict_codecs)); |
} |
// If we don't recognize the codec, it's possible we support it. |
std::vector<std::string> parsed_codecs; |
- net::ParseCodecString(ToASCIIOrEmpty(codecs), &parsed_codecs, true); |
- if (!net::AreSupportedMediaCodecs(parsed_codecs)) |
+ media::ParseCodecString(ToASCIIOrEmpty(codecs), &parsed_codecs, true); |
+ if (!media::AreSupportedMediaCodecs(parsed_codecs)) |
return MayBeSupported; |
// Otherwise we have a perfect match. |
@@ -456,7 +456,7 @@ bool RendererBlinkPlatformImpl::MimeRegistry::supportsMediaSourceMIMEType( |
const WebString& codecs) { |
const std::string mime_type_ascii = ToASCIIOrEmpty(mime_type); |
std::vector<std::string> parsed_codec_ids; |
- net::ParseCodecString(ToASCIIOrEmpty(codecs), &parsed_codec_ids, false); |
+ media::ParseCodecString(ToASCIIOrEmpty(codecs), &parsed_codec_ids, false); |
if (mime_type_ascii.empty()) |
return false; |
return media::StreamParserFactory::IsTypeSupported( |