Index: content/child/site_isolation_policy_unittest.cc |
diff --git a/content/child/site_isolation_policy_unittest.cc b/content/child/site_isolation_policy_unittest.cc |
index 041b7c624b75c6732c48dd5ca4b01eaf476e3641..8f01bc5eb44eda9f89a0fa101619aba0ec65ba4d 100644 |
--- a/content/child/site_isolation_policy_unittest.cc |
+++ b/content/child/site_isolation_policy_unittest.cc |
@@ -14,7 +14,7 @@ using base::StringPiece; |
namespace content { |
-TEST(SiteIsolationPolicyTest, IsBlockableScheme) { |
+TEST(CrossSiteDocumentClassifierTest, IsBlockableScheme) { |
GURL data_url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA=="); |
GURL ftp_url("ftp://google.com"); |
GURL mailto_url("mailto:google@google.com"); |
@@ -22,54 +22,55 @@ TEST(SiteIsolationPolicyTest, IsBlockableScheme) { |
GURL http_url("http://google.com"); |
GURL https_url("https://google.com"); |
- EXPECT_FALSE(SiteIsolationPolicy::IsBlockableScheme(data_url)); |
- EXPECT_FALSE(SiteIsolationPolicy::IsBlockableScheme(ftp_url)); |
- EXPECT_FALSE(SiteIsolationPolicy::IsBlockableScheme(mailto_url)); |
- EXPECT_FALSE(SiteIsolationPolicy::IsBlockableScheme(about_url)); |
- EXPECT_TRUE(SiteIsolationPolicy::IsBlockableScheme(http_url)); |
- EXPECT_TRUE(SiteIsolationPolicy::IsBlockableScheme(https_url)); |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::IsBlockableScheme(data_url)); |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::IsBlockableScheme(ftp_url)); |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::IsBlockableScheme(mailto_url)); |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::IsBlockableScheme(about_url)); |
+ EXPECT_TRUE(CrossSiteDocumentClassifier::IsBlockableScheme(http_url)); |
+ EXPECT_TRUE(CrossSiteDocumentClassifier::IsBlockableScheme(https_url)); |
} |
-TEST(SiteIsolationPolicyTest, IsSameSite) { |
+TEST(CrossSiteDocumentClassifierTest, IsSameSite) { |
GURL a_com_url0("https://mock1.a.com:8080/page1.html"); |
GURL a_com_url1("https://mock2.a.com:9090/page2.html"); |
GURL a_com_url2("https://a.com/page3.html"); |
- EXPECT_TRUE(SiteIsolationPolicy::IsSameSite(a_com_url0, a_com_url1)); |
- EXPECT_TRUE(SiteIsolationPolicy::IsSameSite(a_com_url1, a_com_url2)); |
- EXPECT_TRUE(SiteIsolationPolicy::IsSameSite(a_com_url2, a_com_url0)); |
+ EXPECT_TRUE(CrossSiteDocumentClassifier::IsSameSite(a_com_url0, a_com_url1)); |
+ EXPECT_TRUE(CrossSiteDocumentClassifier::IsSameSite(a_com_url1, a_com_url2)); |
+ EXPECT_TRUE(CrossSiteDocumentClassifier::IsSameSite(a_com_url2, a_com_url0)); |
GURL b_com_url0("https://mock1.b.com/index.html"); |
- EXPECT_FALSE(SiteIsolationPolicy::IsSameSite(a_com_url0, b_com_url0)); |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::IsSameSite(a_com_url0, b_com_url0)); |
GURL about_blank_url("about:blank"); |
- EXPECT_FALSE(SiteIsolationPolicy::IsSameSite(a_com_url0, about_blank_url)); |
+ EXPECT_FALSE( |
+ CrossSiteDocumentClassifier::IsSameSite(a_com_url0, about_blank_url)); |
GURL chrome_url("chrome://extension"); |
- EXPECT_FALSE(SiteIsolationPolicy::IsSameSite(a_com_url0, chrome_url)); |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::IsSameSite(a_com_url0, chrome_url)); |
GURL empty_url(""); |
- EXPECT_FALSE(SiteIsolationPolicy::IsSameSite(a_com_url0, empty_url)); |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::IsSameSite(a_com_url0, empty_url)); |
} |
-TEST(SiteIsolationPolicyTest, IsValidCorsHeaderSet) { |
+TEST(CrossSiteDocumentClassifierTest, IsValidCorsHeaderSet) { |
GURL frame_origin("http://www.google.com"); |
GURL site_origin("http://www.yahoo.com"); |
- EXPECT_TRUE(SiteIsolationPolicy::IsValidCorsHeaderSet( |
+ EXPECT_TRUE(CrossSiteDocumentClassifier::IsValidCorsHeaderSet( |
frame_origin, site_origin, "*")); |
- EXPECT_FALSE(SiteIsolationPolicy::IsValidCorsHeaderSet( |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::IsValidCorsHeaderSet( |
frame_origin, site_origin, "\"*\"")); |
- EXPECT_TRUE(SiteIsolationPolicy::IsValidCorsHeaderSet( |
+ EXPECT_TRUE(CrossSiteDocumentClassifier::IsValidCorsHeaderSet( |
frame_origin, site_origin, "http://mail.google.com")); |
- EXPECT_FALSE(SiteIsolationPolicy::IsValidCorsHeaderSet( |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::IsValidCorsHeaderSet( |
frame_origin, site_origin, "https://mail.google.com")); |
- EXPECT_FALSE(SiteIsolationPolicy::IsValidCorsHeaderSet( |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::IsValidCorsHeaderSet( |
frame_origin, site_origin, "http://yahoo.com")); |
- EXPECT_FALSE(SiteIsolationPolicy::IsValidCorsHeaderSet( |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::IsValidCorsHeaderSet( |
frame_origin, site_origin, "www.google.com")); |
} |
-TEST(SiteIsolationPolicyTest, SniffForHTML) { |
+TEST(CrossSiteDocumentClassifierTest, SniffForHTML) { |
StringPiece html_data(" \t\r\n <HtMladfokadfkado"); |
StringPiece comment_html_data(" <!-- this is comment --> <html><body>"); |
StringPiece two_comments_html_data( |
@@ -80,55 +81,56 @@ TEST(SiteIsolationPolicyTest, SniffForHTML) { |
StringPiece comment_js_data(" <!-- this is comment -> document.write(1); "); |
StringPiece empty_data(""); |
- EXPECT_TRUE(SiteIsolationPolicy::SniffForHTML(html_data)); |
- EXPECT_TRUE(SiteIsolationPolicy::SniffForHTML(comment_html_data)); |
- EXPECT_TRUE(SiteIsolationPolicy::SniffForHTML(two_comments_html_data)); |
- EXPECT_TRUE(SiteIsolationPolicy::SniffForHTML(mixed_comments_html_data)); |
- EXPECT_FALSE(SiteIsolationPolicy::SniffForHTML(non_html_data)); |
- EXPECT_FALSE(SiteIsolationPolicy::SniffForHTML(comment_js_data)); |
+ EXPECT_TRUE(CrossSiteDocumentClassifier::SniffForHTML(html_data)); |
+ EXPECT_TRUE(CrossSiteDocumentClassifier::SniffForHTML(comment_html_data)); |
+ EXPECT_TRUE( |
+ CrossSiteDocumentClassifier::SniffForHTML(two_comments_html_data)); |
+ EXPECT_TRUE( |
+ CrossSiteDocumentClassifier::SniffForHTML(mixed_comments_html_data)); |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::SniffForHTML(non_html_data)); |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::SniffForHTML(comment_js_data)); |
// Basic bounds check. |
- EXPECT_FALSE(SiteIsolationPolicy::SniffForHTML(empty_data)); |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::SniffForHTML(empty_data)); |
} |
-TEST(SiteIsolationPolicyTest, SniffForXML) { |
+TEST(CrossSiteDocumentClassifierTest, SniffForXML) { |
StringPiece xml_data(" \t \r \n <?xml version=\"1.0\"?>\n <catalog"); |
StringPiece non_xml_data(" var name=window.location;\nadfadf"); |
StringPiece empty_data(""); |
- EXPECT_TRUE(SiteIsolationPolicy::SniffForXML(xml_data)); |
- EXPECT_FALSE(SiteIsolationPolicy::SniffForXML(non_xml_data)); |
+ EXPECT_TRUE(CrossSiteDocumentClassifier::SniffForXML(xml_data)); |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::SniffForXML(non_xml_data)); |
// Basic bounds check. |
- EXPECT_FALSE(SiteIsolationPolicy::SniffForXML(empty_data)); |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::SniffForXML(empty_data)); |
} |
-TEST(SiteIsolationPolicyTest, SniffForJSON) { |
+TEST(CrossSiteDocumentClassifierTest, SniffForJSON) { |
StringPiece json_data("\t\t\r\n { \"name\" : \"chrome\", "); |
StringPiece non_json_data0("\t\t\r\n { name : \"chrome\", "); |
StringPiece non_json_data1("\t\t\r\n foo({ \"name\" : \"chrome\", "); |
StringPiece empty_data(""); |
- EXPECT_TRUE( |
- SiteIsolationPolicy::SniffForJSON(json_data)); |
- EXPECT_FALSE(SiteIsolationPolicy::SniffForJSON(non_json_data0)); |
- EXPECT_FALSE(SiteIsolationPolicy::SniffForJSON(non_json_data1)); |
+ EXPECT_TRUE(CrossSiteDocumentClassifier::SniffForJSON(json_data)); |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::SniffForJSON(non_json_data0)); |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::SniffForJSON(non_json_data1)); |
// Basic bounds check. |
- EXPECT_FALSE(SiteIsolationPolicy::SniffForJSON(empty_data)); |
+ EXPECT_FALSE(CrossSiteDocumentClassifier::SniffForJSON(empty_data)); |
} |
-TEST(SiteIsolationPolicyTest, SniffForJS) { |
+TEST(SiteIsolationStatsGathererTest, SniffForJS) { |
StringPiece basic_js_data("var a = 4"); |
StringPiece js_data("\t\t\r\n var a = 4"); |
StringPiece json_data("\t\t\r\n { \"name\" : \"chrome\", "); |
StringPiece empty_data(""); |
- EXPECT_TRUE(SiteIsolationPolicy::SniffForJS(js_data)); |
- EXPECT_FALSE(SiteIsolationPolicy::SniffForJS(json_data)); |
+ EXPECT_TRUE(SiteIsolationStatsGatherer::SniffForJS(js_data)); |
+ EXPECT_FALSE(SiteIsolationStatsGatherer::SniffForJS(json_data)); |
// Basic bounds check. |
- EXPECT_FALSE(SiteIsolationPolicy::SniffForJS(empty_data)); |
+ EXPECT_FALSE(SiteIsolationStatsGatherer::SniffForJS(empty_data)); |
} |
} // namespace content |