Enabling MHTML.

net/base/mime_util.cc

 // Copyright (c) 2011 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 <map>
 #include <string>
 
 #include "net/base/mime_util.h"
 #include "net/base/platform_mime_util.h"
 
@@ skipping 99 matching lines @@
   { "image/tiff", "tiff,tif" },
   { "image/x-xbitmap", "xbm" },
   { "image/svg+xml", "svg,svgz" },
   { "message/rfc822", "eml" },
   { "text/plain", "txt,text" },
   { "text/html", "shtml,ehtml" },
   { "application/rss+xml", "rss" },
   { "application/rdf+xml", "rdf" },
   { "text/xml", "xsl,xbl" },
   { "application/vnd.mozilla.xul+xml", "xul" },
-  { "application/x-shockwave-flash", "swf,swl" }
+  { "application/x-shockwave-flash", "swf,swl" },
+  { "multipart/related", "mht,mhtml" }
 };
 
 static const char* FindMimeType(const MimeInfo* mappings,
                                 size_t mappings_len,
                                 const char* ext) {
   size_t ext_len = strlen(ext);
 
   for (size_t i = 0; i < mappings_len; ++i) {
     const char* extensions = mappings[i].extensions;
     for (;;) {
@@ skipping 128 matching lines @@
   "text/css",
   "text/vnd.chromium.ftp-dir",
   "text/",
   "image/svg+xml",  // SVG is text-based XML, even though it has an image/ type
   "application/xml",
   "application/xhtml+xml",
   "application/rss+xml",
   "application/atom+xml",
   "application/json",
   "application/x-x509-user-cert",
+  "multipart/related",  // For MHTML support.
   "multipart/x-mixed-replace"
   // Note: ADDING a new type here will probably render it AS HTML. This can
   // result in cross site scripting.
 };
-COMPILE_ASSERT(arraysize(supported_non_image_types) == 16,
-               supported_non_images_types_must_equal_16);
+COMPILE_ASSERT(arraysize(supported_non_image_types) == 17,
+               supported_non_images_types_must_equal_17);

[wtc, 2011/05/25 00:31:49]

This COMPILE_ASSERT probably should be removed.  As far as
I can tell, the assertion verifies that the arraysize() macro
works correctly, rather than the supported_non_image_types array
must have a certain number of elements.

 
 //  Mozilla 1.8 and WinIE 7 both accept text/javascript and text/ecmascript.
 //  Mozilla 1.8 accepts application/javascript, application/ecmascript, and
 // application/x-javascript, but WinIE 7 doesn't.
 //  WinIE 7 accepts text/javascript1.1 - text/javascript1.3, text/jscript, and
 // text/livescript, but Mozilla 1.8 doesn't.
 //  Mozilla 1.8 allows leading and trailing whitespace, but WinIE 7 doesn't.
 //  Mozilla 1.8 and WinIE 7 both accept the empty string, but neither accept a
 // whitespace-only string.
 //  We want to accept all the values that either of these browsers accept, but
@@ skipping 422 matching lines @@
 
   GetExtensionsFromHardCodedMappings(secondary_mappings,
                                      arraysize(secondary_mappings),
                                      mime_type,
                                      &unique_extensions);
 
   HashSetToVector(&unique_extensions, extensions);
 }
 
 }  // namespace net