| Index: net/base/mime_util.cc
|
| diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
|
| index 500cdbab416b487e618b5c7e92d2cf8ff2fd7b2f..e7ed54da3c0ff2f693e4517dcc71085f4c61fb7d 100644
|
| --- a/net/base/mime_util.cc
|
| +++ b/net/base/mime_util.cc
|
| @@ -934,30 +934,6 @@ void GetExtensionsForMimeType(
|
| HashSetToVector(&unique_extensions, extensions);
|
| }
|
|
|
| -void GetMediaTypesBlacklistedForTests(std::vector<std::string>* types) {
|
| - types->clear();
|
| -
|
| -// Unless/until WebM files are added to the media layout tests, we need to avoid
|
| -// blacklisting mp4 and H.264 when Theora is not supported (and proprietary
|
| -// codecs are) so that the media tests can still run.
|
| -#if defined(ENABLE_MEDIA_CODEC_THEORA) || !defined(USE_PROPRIETARY_CODECS)
|
| - for (size_t i = 0; i < arraysize(proprietary_media_types); ++i)
|
| - types->push_back(proprietary_media_types[i]);
|
| -#endif
|
| -}
|
| -
|
| -void GetMediaCodecsBlacklistedForTests(std::vector<std::string>* codecs) {
|
| - codecs->clear();
|
| -
|
| -// Unless/until WebM files are added to the media layout tests, we need to avoid
|
| -// blacklisting mp4 and H.264 when Theora is not supported (and proprietary
|
| -// codecs are) so that the media tests can still run.
|
| -#if defined(ENABLE_MEDIA_CODEC_THEORA) || !defined(USE_PROPRIETARY_CODECS)
|
| - for (size_t i = 0; i < arraysize(proprietary_media_codecs); ++i)
|
| - codecs->push_back(proprietary_media_codecs[i]);
|
| -#endif
|
| -}
|
| -
|
| const std::string GetIANAMediaType(const std::string& mime_type) {
|
| for (size_t i = 0; i < arraysize(kIanaMediaTypes); ++i) {
|
| if (StartsWithASCII(mime_type, kIanaMediaTypes[i].matcher, true)) {
|
|
|