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

content/child/simple_webmimeregistry_impl.cc

 // Copyright 2014 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 "content/child/simple_webmimeregistry_impl.h"
 
 #include "base/files/file_path.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "media/base/mime_util.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
 using blink::WebString;
 using blink::WebMimeRegistry;
 
 namespace content {
 
 //static
 std::string SimpleWebMimeRegistryImpl::ToASCIIOrEmpty(const WebString& string) {
@@ skipping 41 matching lines @@
     const blink::WebString& key_system,
     const blink::WebString& mime_type,
     const blink::WebString& codecs) {
   // Media features are only supported at the content/renderer layer.
   return false;
 }
 
 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))) ?

[scherkus (not reviewing), 2014/07/18 01:02:33]

nit: ||'s go on the previous line

[acolwell GONE FROM CHROMIUM, 2014/07/18 01:33:50]

Done.

       WebMimeRegistry::IsSupported : WebMimeRegistry::IsNotSupported;
 }
 
 WebString SimpleWebMimeRegistryImpl::mimeTypeForExtension(
     const WebString& file_extension) {
   std::string mime_type;
   net::GetMimeTypeFromExtension(
       base::FilePath::FromUTF16Unsafe(file_extension).value(), &mime_type);
   return WebString::fromUTF8(mime_type);
 }
 
 WebString SimpleWebMimeRegistryImpl::wellKnownMimeTypeForExtension(
     const WebString& file_extension) {
   std::string mime_type;
   net::GetWellKnownMimeTypeFromExtension(
       base::FilePath::FromUTF16Unsafe(file_extension).value(), &mime_type);
   return WebString::fromUTF8(mime_type);
 }
 
 WebString SimpleWebMimeRegistryImpl::mimeTypeFromFile(
     const WebString& file_path) {
   std::string mime_type;
   net::GetMimeTypeFromFile(base::FilePath::FromUTF16Unsafe(file_path),
                            &mime_type);
   return WebString::fromUTF8(mime_type);
 }
 
 }  // namespace content