Updated media MIME type handling for Chrome and Chromium.

net/base/mime_util.cc

 // Copyright (c) 2006-2009 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 <string>
 
 #include "net/base/mime_util.h"
 #include "net/base/platform_mime_util.h"
 
 #include "base/hash_tables.h"
@@ skipping 51 matching lines @@
   const char* extensions;  // comma separated list
 };
 
 static const MimeInfo primary_mappings[] = {
   { "text/html", "html,htm" },
   { "text/css", "css" },
   { "text/xml", "xml" },
   { "image/gif", "gif" },
   { "image/jpeg", "jpeg,jpg" },
   { "image/png", "png" },
-#if defined(GOOGLE_CHROME_BUILD)
   { "video/mp4", "mp4,m4v" },
   { "audio/x-m4a", "m4a" },
   { "audio/mp3", "mp3" },
-#endif
   { "video/ogg", "ogv,ogm" },
   { "audio/ogg", "ogg,oga" },
   { "application/xhtml+xml", "xhtml,xht" }
 };
 
 static const MimeInfo secondary_mappings[] = {
   { "application/octet-stream", "exe,com,bin" },
   { "application/gzip", "gz" },
   { "application/pdf", "pdf" },
   { "application/postscript", "ps,eps,ai" },
@@ skipping 86 matching lines @@
   "image/jpg",
   "image/png",
   "image/gif",
   "image/bmp",
   "image/x-icon",    // ico
   "image/x-xbitmap"  // xbm
 };
 
 // A list of media types: http://en.wikipedia.org/wiki/Internet_media_type
 // A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php
-
 static const char* const supported_media_types[] = {
   // Ogg.
   "video/ogg",
   "audio/ogg",
 
-  // TODO(fbarchard): Remove these for Chromium when layout tests dont use mp4
+#if defined(GOOGLE_CHROME_BUILD)
   // MPEG-4.
   "video/mp4",
   "video/x-m4v",
   "audio/mp4",
   "audio/x-m4a",
 
   // MP3.
   "audio/mp3",
   "audio/x-mp3",
-
-  // Generic MPEG mime-types.
-  // TODO(fbarchard): Remove these when layout tests stop using mpg.
-  "audio/mpeg",
-  "video/mpeg"
+#endif
 };
 
 // Note: does not include javascript types list (see supported_javascript_types)
 static const char* const supported_non_image_types[] = {
   "text/html",
   "text/xml",
   "text/xsl",
   "text/plain",
   // Many users complained about css files served for
   // download instead of displaying in the browser:
@@ skipping 195 matching lines @@
                      const std::string &mime_type) {
   return GetMimeUtil()->MatchesMimeType(mime_type_pattern, mime_type);
 }
 
 void ParseCodecString(const std::string& codecs,
                       std::vector<std::string>* codecs_out) {
   GetMimeUtil()->ParseCodecString(codecs, codecs_out);
 }
 
 }  // namespace net