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

components/mime_util/mime_util.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/mime_util/mime_util.h"
 
 #include "base/containers/hash_tables.h"
 #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 {
 
 namespace {
 
 // Dictionary of cryptographic file mime types.
 struct CertificateMimeTypeInfo {
   const char* const mime_type;
   net::CertificateMimeType cert_type;
 };
@@ skipping 125 matching lines @@
 }
 
 bool MimeUtil::IsSupportedImageMimeType(const std::string& mime_type) const {
   return image_types_.find(base::StringToLowerASCII(mime_type)) !=
          image_types_.end();
 }
 
 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 {
   return unsupported_text_types_.find(base::StringToLowerASCII(mime_type)) !=
          unsupported_text_types_.end();
 }
 
 bool MimeUtil::IsSupportedJavascriptMimeType(
     const std::string& mime_type) const {
   return javascript_types_.find(mime_type) != javascript_types_.end();
@@ skipping 45 matching lines @@
     if (base::strcasecmp(mime_type.c_str(),
                          kSupportedCertificateTypes[i].mime_type) == 0) {
       return kSupportedCertificateTypes[i].cert_type;
     }
   }
 
   return net::CERTIFICATE_MIME_TYPE_UNKNOWN;
 }
 
 }  // namespace mime_util