summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authorddorwin <ddorwin@chromium.org>2015-02-26 10:54:06 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-26 18:55:25 +0000
commit82fb05447756b104d3bd2e654195784cb281bc8c (patch)
tree5ccd1fa94e7a6ba1cb595627079c4ed19599ce0f /mojo
parentad912fc2a22d3ddd4c52cb70b487fcb268941ec2 (diff)
downloadchromium_src-82fb05447756b104d3bd2e654195784cb281bc8c.zip
chromium_src-82fb05447756b104d3bd2e654195784cb281bc8c.tar.gz
chromium_src-82fb05447756b104d3bd2e654195784cb281bc8c.tar.bz2
Remove obsolete supportsEncryptedMediaMIMEType() from html_viewer.
This method has been removed from WebMimeRegistry. BUG=385874 Review URL: https://codereview.chromium.org/937323003 Cr-Commit-Position: refs/heads/master@{#318273}
Diffstat (limited to 'mojo')
-rw-r--r--mojo/services/html_viewer/webmimeregistry_impl.cc24
-rw-r--r--mojo/services/html_viewer/webmimeregistry_impl.h4
2 files changed, 0 insertions, 28 deletions
diff --git a/mojo/services/html_viewer/webmimeregistry_impl.cc b/mojo/services/html_viewer/webmimeregistry_impl.cc
index c839610..0b7b689 100644
--- a/mojo/services/html_viewer/webmimeregistry_impl.cc
+++ b/mojo/services/html_viewer/webmimeregistry_impl.cc
@@ -101,30 +101,6 @@ bool WebMimeRegistryImpl::supportsMediaSourceMIMEType(
parsed_codec_ids);
}
-bool WebMimeRegistryImpl::supportsEncryptedMediaMIMEType(
- const blink::WebString& key_system,
- const blink::WebString& mime_type,
- const blink::WebString& codecs) {
- // Only supports ASCII parameters.
- if (!base::IsStringASCII(key_system) || !base::IsStringASCII(mime_type) ||
- !base::IsStringASCII(codecs)) {
- return false;
- }
-
- if (key_system.isEmpty())
- return false;
-
- const std::string mime_type_ascii = base::UTF16ToASCII(mime_type);
-
- std::vector<std::string> codec_vector;
- bool strip_suffix = !net::IsStrictMediaMimeType(mime_type_ascii);
- net::ParseCodecString(base::UTF16ToASCII(codecs), &codec_vector,
- strip_suffix);
-
- return media::IsSupportedKeySystemWithMediaMimeType(
- mime_type_ascii, codec_vector, base::UTF16ToASCII(key_system));
-}
-
blink::WebMimeRegistry::SupportsType
WebMimeRegistryImpl::supportsNonImageMIMEType(
const blink::WebString& mime_type) {
diff --git a/mojo/services/html_viewer/webmimeregistry_impl.h b/mojo/services/html_viewer/webmimeregistry_impl.h
index f8d36e7..d629154 100644
--- a/mojo/services/html_viewer/webmimeregistry_impl.h
+++ b/mojo/services/html_viewer/webmimeregistry_impl.h
@@ -31,10 +31,6 @@ class WebMimeRegistryImpl : public blink::WebMimeRegistry {
virtual bool supportsMediaSourceMIMEType(
const blink::WebString& mime_type,
const blink::WebString& codecs);
- virtual bool supportsEncryptedMediaMIMEType(
- const blink::WebString& key_system,
- const blink::WebString& mime_type,
- const blink::WebString& codecs);
virtual blink::WebMimeRegistry::SupportsType supportsNonImageMIMEType(
const blink::WebString& mime_type);
virtual blink::WebString mimeTypeForExtension(