Move media related mimetype functionality out of net/ and into media/.

content/child/simple_webmimeregistry_impl.cc

Index: content/child/simple_webmimeregistry_impl.cc
diff --git a/content/child/simple_webmimeregistry_impl.cc b/content/child/simple_webmimeregistry_impl.cc
index e7416d92041d5443c2cd4782704a549fa4fbb99e..050ef3dee772da3a9298d89523df01dc5d0b9840 100644
--- a/content/child/simple_webmimeregistry_impl.cc
+++ b/content/child/simple_webmimeregistry_impl.cc
@@ -8,6 +8,8 @@
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/common/mime_util.h"
+#include "media/base/mime_util.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
@@ -24,7 +26,7 @@ std::string SimpleWebMimeRegistryImpl::ToASCIIOrEmpty(const WebString& string) {
 
 WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsMIMEType(
     const WebString& mime_type) {
-  return net::IsSupportedMimeType(ToASCIIOrEmpty(mime_type)) ?
+  return content::IsSupportedMimeType(ToASCIIOrEmpty(mime_type)) ?
       WebMimeRegistry::IsSupported : WebMimeRegistry::IsNotSupported;
 }
 
@@ -69,7 +71,8 @@ bool SimpleWebMimeRegistryImpl::supportsEncryptedMediaMIMEType(
 WebMimeRegistry::SupportsType
     SimpleWebMimeRegistryImpl::supportsNonImageMIMEType(
     const WebString& mime_type) {
-  return net::IsSupportedNonImageMimeType(ToASCIIOrEmpty(mime_type)) ?
+  return (net::IsSupportedNonImageMimeType(ToASCIIOrEmpty(mime_type)) ||
+          media::IsSupportedMediaMimeType(ToASCIIOrEmpty(mime_type))) ?
       WebMimeRegistry::IsSupported : WebMimeRegistry::IsNotSupported;
 }