Index: components/content_settings/core/common/content_settings_pattern_unittest.cc |
diff --git a/components/content_settings/core/common/content_settings_pattern_unittest.cc b/components/content_settings/core/common/content_settings_pattern_unittest.cc |
index 74e601979446d3c2ef185b6f358f03d05b2ed5f6..51ebf03555d828c71552d49dd20a3ab6bde8e3c0 100644 |
--- a/components/content_settings/core/common/content_settings_pattern_unittest.cc |
+++ b/components/content_settings/core/common/content_settings_pattern_unittest.cc |
@@ -720,3 +720,55 @@ TEST(ContentSettingsPatternTest, CanonicalizePattern_Legacy) { |
EXPECT_STREQ("", Pattern("*\xC4\x87ira.com").ToString().c_str()); |
EXPECT_STREQ("", Pattern("\xC4\x87ira.*").ToString().c_str()); |
} |
+ |
+TEST(ContentSettingsPatternTest, IsGeneratedUsingFromURL) { |
+ // These are pattern styles which might be generated from FromURL(). |
+ EXPECT_TRUE(ContentSettingsPattern::FromString("[*.]example.com") |
+ .IsGeneratedUsingFromURL()); |
+ EXPECT_TRUE(ContentSettingsPattern::FromString("[*.]google.com:80") |
+ .IsGeneratedUsingFromURL()); |
+ EXPECT_TRUE(ContentSettingsPattern::FromString("https://[*.]google.com:443") |
+ .IsGeneratedUsingFromURL()); |
+ // These patterns either have an empty host, or have no domain wildcard, so |
+ // they can not be generated from FromURL(). |
+ EXPECT_FALSE( |
+ ContentSettingsPattern::FromString("*").IsGeneratedUsingFromURL()); |
+ EXPECT_FALSE( |
+ ContentSettingsPattern::FromString("[*.]").IsGeneratedUsingFromURL()); |
+ EXPECT_FALSE( |
+ ContentSettingsPattern::FromString("http://*").IsGeneratedUsingFromURL()); |
+ EXPECT_FALSE(ContentSettingsPattern::FromString("http://*:8080") |
+ .IsGeneratedUsingFromURL()); |
+ EXPECT_FALSE(ContentSettingsPattern::FromString("*://www.google.com:8080") |
+ .IsGeneratedUsingFromURL()); |
+ EXPECT_FALSE(ContentSettingsPattern::FromString("www.example.com:8080") |
+ .IsGeneratedUsingFromURL()); |
+ EXPECT_FALSE(ContentSettingsPattern::FromString("www.google.com/*") |
+ .IsGeneratedUsingFromURL()); |
+ EXPECT_FALSE( |
+ ContentSettingsPattern::FromString("google").IsGeneratedUsingFromURL()); |
+ EXPECT_FALSE(ContentSettingsPattern::FromString("https://www.google.com") |
+ .IsGeneratedUsingFromURL()); |
+ EXPECT_FALSE(ContentSettingsPattern::FromString("https://www.google.com:443") |
+ .IsGeneratedUsingFromURL()); |
+ EXPECT_FALSE(ContentSettingsPattern::FromString("https://[*.]google.com") |
+ .IsGeneratedUsingFromURL()); |
raymes
2016/06/20 04:03:26
We should make sure that the tests cover each of t
lshang
2016/06/23 01:32:32
Done.
|
+} |
+ |
+TEST(ContentSettingsPatternTest, FromDomainToOrigin) { |
+ EXPECT_STREQ( |
+ "http://example.com:80", |
+ ContentSettingsPattern::FromDomainToOrigin(Pattern("[*.]example.com")) |
+ .ToString() |
+ .c_str()); |
raymes
2016/06/20 04:03:26
does expect_eq work, if you get rid of the call to
lshang
2016/06/23 01:32:32
Done.
|
+ EXPECT_STREQ( |
+ "http://example.com:80", |
+ ContentSettingsPattern::FromDomainToOrigin(Pattern("[*.]example.com:80")) |
+ .ToString() |
+ .c_str()); |
+ EXPECT_STREQ("https://example.com:443", |
+ ContentSettingsPattern::FromDomainToOrigin( |
+ Pattern("https://[*.]example.com:443")) |
+ .ToString() |
+ .c_str()); |
raymes
2016/06/20 04:03:26
We should also test a case with a port wildcard
lshang
2016/06/23 01:32:32
Https patterns generated using FromURL() should al
raymes
2016/06/27 07:23:29
Ahh that makes sense
|
+} |