Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(453)

Unified Diff: net/base/mime_sniffer_unittest.cc

Issue 2883833002: net: Do not sniff XHTML content (Closed)
Patch Set: Remove XHTML content sniff entirely Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/mime_sniffer_unittest.cc
diff --git a/net/base/mime_sniffer_unittest.cc b/net/base/mime_sniffer_unittest.cc
index 590dd77f4a079dcd34befce0c18746fe101c6cd8..f8ace25b224ecc5b8c3e143ad2b89cb4fa13daa3 100644
--- a/net/base/mime_sniffer_unittest.cc
+++ b/net/base/mime_sniffer_unittest.cc
@@ -339,17 +339,13 @@ TEST(MimeSnifferTest, XMLTest) {
EXPECT_EQ("text/plain",
SniffMimeType("<?xml?><notafeed", std::string(), "text/plain"));
- // Positive test for the two instances we upgrade to XHTML.
- EXPECT_EQ("application/xhtml+xml",
+ // We never upgrade to application/xhtml+xml.
+ EXPECT_EQ("text/xml",
SniffMimeType("<html xmlns=\"http://www.w3.org/1999/xhtml\">",
- std::string(),
- "text/xml"));
- EXPECT_EQ("application/xhtml+xml",
+ std::string(), "text/xml"));
+ EXPECT_EQ("application/xml",
SniffMimeType("<html xmlns=\"http://www.w3.org/1999/xhtml\">",
- std::string(),
- "application/xml"));
-
- // Following our behavior with HTML, don't call other mime types XHTML.
+ std::string(), "application/xml"));
EXPECT_EQ("text/plain",
SniffMimeType("<html xmlns=\"http://www.w3.org/1999/xhtml\">",
std::string(),
@@ -358,8 +354,6 @@ TEST(MimeSnifferTest, XMLTest) {
SniffMimeType("<html xmlns=\"http://www.w3.org/1999/xhtml\">",
std::string(),
"application/rss+xml"));
-
- // Don't sniff other HTML-looking bits as HTML.
EXPECT_EQ("text/xml",
SniffMimeType("<html><head>", std::string(), "text/xml"));
EXPECT_EQ("text/xml",

Powered by Google App Engine
This is Rietveld 408576698