Moved media mime type and codec checks to media/base/mime_util.*

components/mime_util/mime_util.cc

Index: components/mime_util/mime_util.cc
diff --git a/components/mime_util/mime_util.cc b/components/mime_util/mime_util.cc
index a017f459bfffeea41a5e3a2d18c598ef8bf0e396..1819cc4dee24f34900ea56ee42174873b4cd7d7d 100644
--- a/components/mime_util/mime_util.cc
+++ b/components/mime_util/mime_util.cc
@@ -8,6 +8,10 @@
 #include "base/lazy_instance.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
+#if !defined(OS_IOS)

[Ryan Sleevi, 2015/05/13 23:55:53]

newline between 10 & 11

https://www.chromium.org/developers/coding-style#TOC-Platform-specific-code

[servolk, 2015/05/14 00:13:23]

Done.

+// iOS doesn't use and must not depend on //media
+#include "media/base/mime_util.h"
+#endif
 
 namespace mime_util {
 
@@ -153,11 +157,13 @@ bool MimeUtil::IsSupportedImageMimeType(const std::string& mime_type) const {
 bool MimeUtil::IsSupportedNonImageMimeType(const std::string& mime_type) const {
   return non_image_types_.find(base::StringToLowerASCII(mime_type)) !=
              non_image_types_.end() ||
+#if !defined(OS_IOS)
+         media::IsSupportedMediaMimeType(mime_type) ||
+#endif
          (StartsWithASCII(mime_type, "text/", false /* case insensitive */) &&
           !IsUnsupportedTextMimeType(mime_type)) ||
          (StartsWithASCII(mime_type, "application/", false) &&
-          net::MatchesMimeType("application/*+json", mime_type)) ||
-         net::IsSupportedMediaMimeType(mime_type);
+          net::MatchesMimeType("application/*+json", mime_type));
 }
 
 bool MimeUtil::IsUnsupportedTextMimeType(const std::string& mime_type) const {