diff options
| author | martina.kollarova <martina.kollarova@intel.com> | 2015-04-09 00:18:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-09 07:19:05 +0000 |
| commit | ea8dd94e6cb9ff95a9698adcc67da0e635a293e6 (patch) | |
| tree | e10847ba63c87c5ba51e7af5a9b82a5a653d54c4 /components/content_settings | |
| parent | 76603b08791f28d2e25b92188e0e8f75739fea5e (diff) | |
| download | chromium_src-ea8dd94e6cb9ff95a9698adcc67da0e635a293e6.zip chromium_src-ea8dd94e6cb9ff95a9698adcc67da0e635a293e6.tar.gz chromium_src-ea8dd94e6cb9ff95a9698adcc67da0e635a293e6.tar.bz2 | |
Show content settings exceptions in correct order
The patterns are internally sorted from the lowest precedence to highest (i.e.
from the less specific pattern to the most specific, though the rules are more
complicated than that), and they were shown to the user in this order too,
which was confusing and making them think it's not sorted at all. Showing the
highest precedence patterns first should be more intuitive and also sort the
equivalent patterns more-or-less alphabetically.
BUG=450580
Review URL: https://codereview.chromium.org/1047153002
Cr-Commit-Position: refs/heads/master@{#324392}
Diffstat (limited to 'components/content_settings')
| -rw-r--r-- | components/content_settings/core/common/content_settings_pattern_unittest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
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 3688d84..3fb0448 100644 --- a/components/content_settings/core/common/content_settings_pattern_unittest.cc +++ b/components/content_settings/core/common/content_settings_pattern_unittest.cc @@ -555,6 +555,7 @@ TEST(ContentSettingsPatternTest, Compare) { EXPECT_EQ(ContentSettingsPattern::SUCCESSOR, Pattern("[*.]google.com").Compare( Pattern("mail.google.com"))); + EXPECT_TRUE(Pattern("mail.google.com") > Pattern("[*.]google.com")); EXPECT_EQ(ContentSettingsPattern::PREDECESSOR, Pattern("[*.]mail.google.com").Compare( @@ -562,6 +563,7 @@ TEST(ContentSettingsPatternTest, Compare) { EXPECT_EQ(ContentSettingsPattern::SUCCESSOR, Pattern("[*.]google.com").Compare( Pattern("[*.]mail.google.com"))); + EXPECT_TRUE(Pattern("[*.]mail.google.com") > Pattern("[*.]google.com")); EXPECT_EQ(ContentSettingsPattern::PREDECESSOR, Pattern("mail.google.com:80").Compare( @@ -569,6 +571,7 @@ TEST(ContentSettingsPatternTest, Compare) { EXPECT_EQ(ContentSettingsPattern::SUCCESSOR, Pattern("mail.google.com:*").Compare( Pattern("mail.google.com:80"))); + EXPECT_TRUE(Pattern("mail.google.com:80") > Pattern("mail.google.com:*")); EXPECT_EQ(ContentSettingsPattern::PREDECESSOR, Pattern("https://mail.google.com:*").Compare( |