net/base/mime_sniffer_unittest.cc - Issue 2883833002: net: Do not sniff XHTML content

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/base/mime_sniffer_unittest.cc

Issue 2883833002: net: Do not sniff XHTML content (Closed)

Patch Set: Update tests 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

« no previous file with comments | « net/base/mime_sniffer.cc ('k') | third_party/WebKit/LayoutTests/external/wpt/dom/nodes/Document-createElement-namespace-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..1a517bbb6f77750439eb2b164277c41ff4764807 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,14 +354,13 @@ 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",

- SniffMimeType("<foo><html xmlns=\"http://www.w3.org/1999/xhtml\">",

- std::string(),

- "text/xml"));

+ SniffMimeType("<foo><rss "

+ "xmlns:feedburner=\"http://rssnamespace.org/"

+ "feedburner/ext/1.0\" version=\"2.0\">",

+ std::string(), "text/xml"));

}

// Test content which is >= 1024 bytes, and includes no open angle bracket.