diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2016-06-07 20:28:41 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2016-06-07 20:28:41 +0000 |
| commit | 45d3cc73dc908af3262c6a714cb755edd03f071a (patch) | |
| tree | 564e40b2ccfe669385077be2c94de93ac0c15fe3 /www/chromium/files/patch-net_base_mime__util__unittest.cc | |
| parent | Update to 6.0p1. Notable fixes: (diff) | |
www/chromium: update to 51.0.2704.84
A lot of patch files are renamed in this update.
Submitted by: Timothy Vaccarelli
Obtained from: https://github.com/LeFroid/
MFH: 2016Q2
Security: http://vuxml.freebsd.org/freebsd/c039a761-2c29-11e6-8912-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/1a6bbb95-24b8-11e6-bd31-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/4dfafa16-24ba-11e6-bd31-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/7da1da96-24bb-11e6-bd31-3065ec8fd3ec.html
Security: http://vuxml.freebsd.org/freebsd/6d8505f0-0614-11e6-b39c-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-net_base_mime__util__unittest.cc')
| -rw-r--r-- | www/chromium/files/patch-net_base_mime__util__unittest.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/www/chromium/files/patch-net_base_mime__util__unittest.cc b/www/chromium/files/patch-net_base_mime__util__unittest.cc new file mode 100644 index 000000000000..3dddf3a79711 --- /dev/null +++ b/www/chromium/files/patch-net_base_mime__util__unittest.cc @@ -0,0 +1,11 @@ +--- net/base/mime_util_unittest.cc.orig 2016-03-25 13:04:50 UTC ++++ net/base/mime_util_unittest.cc +@@ -241,7 +241,7 @@ TEST(MimeUtilTest, TestGetExtensionsForM + { "MeSsAge/*", 1, "eml" }, + { "image/bmp", 1, "bmp" }, + { "video/*", 6, "mp4" }, +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_IOS) ++#if (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_IOS) + { "video/*", 6, "mpg" }, + #else + { "video/*", 6, "mpeg" }, |