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

BUG=318217

Review URL: https://codereview.chromium.org/1129643002

Cr-Commit-Position: refs/heads/master@{#330239}

4 files changed, 23 insertions, 2 deletions

diff --git a/components/mime_util/BUILD.gn b/components/mime_util/BUILD.gn
index 096db1a..0e3a813 100644
--- a/components/mime_util/BUILD.gn
+++ b/components/mime_util/BUILD.gn
@@ -12,6 +12,11 @@ static_library("mime_util") {
     "//base",
     "//net",
   ]
+
+  # iOS doesn't use and must not depend on //media
+  if (!is_ios) {
+    deps += [ "//media" ]
+  }
 }
 
 source_set("unit_tests") {
diff --git a/components/mime_util/DEPS b/components/mime_util/DEPS
index 7e0780e..2b1acf8 100644
--- a/components/mime_util/DEPS
+++ b/components/mime_util/DEPS
@@ -3,5 +3,6 @@ include_rules = [
   # any dependencies on //content
   "-content",
 
+  "+media/base/mime_util.h",  # Only for platforms other than iOS
   "+net/base",
 ]
diff --git a/components/mime_util/mime_util.cc b/components/mime_util/mime_util.cc
index a017f45..5e5d004 100644
--- a/components/mime_util/mime_util.cc
+++ b/components/mime_util/mime_util.cc
@@ -9,6 +9,11 @@
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 
+#if !defined(OS_IOS)
+// iOS doesn't use and must not depend on //media
+#include "media/base/mime_util.h"
+#endif
+
 namespace mime_util {
 
 namespace {
@@ -153,11 +158,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 {
diff --git a/components/mime_util/mime_util.gyp b/components/mime_util/mime_util.gyp
index 66b4228..c922f98 100644
--- a/components/mime_util/mime_util.gyp
+++ b/components/mime_util/mime_util.gyp
@@ -16,6 +16,14 @@
         'mime_util.cc',
         'mime_util.h',
       ],
+      'conditions': [
+        ['OS!="ios"', {
+          # iOS doesn't use and must not depend on //media
+          'dependencies': [
+            '../../media/media.gyp:media',
+          ],
+        }],
+      ],
     }
   ],
 }