OLD | NEW |
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" | 5 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" |
6 | 6 |
7 #include "base/guid.h" | 7 #include "base/guid.h" |
8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
(...skipping 1679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1690 GetOriginTypeMask()); | 1690 GetOriginTypeMask()); |
1691 | 1691 |
1692 // Verify we still have the allow setting for origin1. | 1692 // Verify we still have the allow setting for origin1. |
1693 ContentSettingsForOneType host_settings; | 1693 ContentSettingsForOneType host_settings; |
1694 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(), | 1694 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(), |
1695 &host_settings); | 1695 &host_settings); |
1696 ASSERT_EQ(2u, host_settings.size()); | 1696 ASSERT_EQ(2u, host_settings.size()); |
1697 EXPECT_EQ(ContentSettingsPattern::FromURLNoWildcard(kOrigin1), | 1697 EXPECT_EQ(ContentSettingsPattern::FromURLNoWildcard(kOrigin1), |
1698 host_settings[0].primary_pattern) | 1698 host_settings[0].primary_pattern) |
1699 << host_settings[0].primary_pattern.ToString(); | 1699 << host_settings[0].primary_pattern.ToString(); |
1700 EXPECT_EQ(CONTENT_SETTING_ALLOW, host_settings[0].setting); | 1700 EXPECT_EQ(CONTENT_SETTING_ALLOW, host_settings[0].GetContentSetting()); |
1701 // And the wildcard. | 1701 // And the wildcard. |
1702 EXPECT_EQ(ContentSettingsPattern::Wildcard(), | 1702 EXPECT_EQ(ContentSettingsPattern::Wildcard(), |
1703 host_settings[1].primary_pattern) | 1703 host_settings[1].primary_pattern) |
1704 << host_settings[1].primary_pattern.ToString(); | 1704 << host_settings[1].primary_pattern.ToString(); |
1705 EXPECT_EQ(CONTENT_SETTING_ASK, host_settings[1].setting); | 1705 EXPECT_EQ(CONTENT_SETTING_ASK, host_settings[1].GetContentSetting()); |
1706 | 1706 |
1707 // There should also only be one setting for origin3 | 1707 // There should also only be one setting for origin3 |
1708 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string(), | 1708 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string(), |
1709 &host_settings); | 1709 &host_settings); |
1710 ASSERT_EQ(2u, host_settings.size()); | 1710 ASSERT_EQ(2u, host_settings.size()); |
1711 EXPECT_EQ(ContentSettingsPattern::FromURLNoWildcard(kOrigin3), | 1711 EXPECT_EQ(ContentSettingsPattern::FromURLNoWildcard(kOrigin3), |
1712 host_settings[0].primary_pattern) | 1712 host_settings[0].primary_pattern) |
1713 << host_settings[0].primary_pattern.ToString(); | 1713 << host_settings[0].primary_pattern.ToString(); |
1714 EXPECT_EQ(CONTENT_SETTING_ALLOW, host_settings[0].setting); | 1714 EXPECT_EQ(CONTENT_SETTING_ALLOW, host_settings[0].GetContentSetting()); |
1715 // And the wildcard. | 1715 // And the wildcard. |
1716 EXPECT_EQ(ContentSettingsPattern::Wildcard(), | 1716 EXPECT_EQ(ContentSettingsPattern::Wildcard(), |
1717 host_settings[1].primary_pattern) | 1717 host_settings[1].primary_pattern) |
1718 << host_settings[1].primary_pattern.ToString(); | 1718 << host_settings[1].primary_pattern.ToString(); |
1719 EXPECT_EQ(CONTENT_SETTING_ASK, host_settings[1].setting); | 1719 EXPECT_EQ(CONTENT_SETTING_ASK, host_settings[1].GetContentSetting()); |
1720 | 1720 |
1721 BlockUntilOriginDataRemoved( | 1721 BlockUntilOriginDataRemoved( |
1722 base::Time(), base::Time::Max(), | 1722 base::Time(), base::Time::Max(), |
1723 ChromeBrowsingDataRemoverDelegate::DATA_TYPE_CONTENT_SETTINGS, | 1723 ChromeBrowsingDataRemoverDelegate::DATA_TYPE_CONTENT_SETTINGS, |
1724 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST)); | 1724 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST)); |
1725 | 1725 |
1726 // Everything except the wildcard should be deleted now. | 1726 // Everything except the wildcard should be deleted now. |
1727 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(), | 1727 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(), |
1728 &host_settings); | 1728 &host_settings); |
1729 ASSERT_EQ(1u, host_settings.size()); | 1729 ASSERT_EQ(1u, host_settings.size()); |
1730 EXPECT_EQ(ContentSettingsPattern::Wildcard(), | 1730 EXPECT_EQ(ContentSettingsPattern::Wildcard(), |
1731 host_settings[0].primary_pattern) | 1731 host_settings[0].primary_pattern) |
1732 << host_settings[0].primary_pattern.ToString(); | 1732 << host_settings[0].primary_pattern.ToString(); |
1733 EXPECT_EQ(CONTENT_SETTING_ASK, host_settings[0].setting); | 1733 EXPECT_EQ(CONTENT_SETTING_ASK, host_settings[0].GetContentSetting()); |
1734 | 1734 |
1735 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string(), | 1735 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string(), |
1736 &host_settings); | 1736 &host_settings); |
1737 ASSERT_EQ(1u, host_settings.size()); | 1737 ASSERT_EQ(1u, host_settings.size()); |
1738 EXPECT_EQ(ContentSettingsPattern::Wildcard(), | 1738 EXPECT_EQ(ContentSettingsPattern::Wildcard(), |
1739 host_settings[0].primary_pattern) | 1739 host_settings[0].primary_pattern) |
1740 << host_settings[0].primary_pattern.ToString(); | 1740 << host_settings[0].primary_pattern.ToString(); |
1741 EXPECT_EQ(CONTENT_SETTING_ASK, host_settings[0].setting); | 1741 EXPECT_EQ(CONTENT_SETTING_ASK, host_settings[0].GetContentSetting()); |
1742 } | 1742 } |
1743 | 1743 |
1744 TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemoveDurablePermission) { | 1744 TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemoveDurablePermission) { |
1745 // Add our settings. | 1745 // Add our settings. |
1746 HostContentSettingsMap* host_content_settings_map = | 1746 HostContentSettingsMap* host_content_settings_map = |
1747 HostContentSettingsMapFactory::GetForProfile(GetProfile()); | 1747 HostContentSettingsMapFactory::GetForProfile(GetProfile()); |
1748 | 1748 |
1749 DurableStoragePermissionContext durable_permission(GetProfile()); | 1749 DurableStoragePermissionContext durable_permission(GetProfile()); |
1750 durable_permission.UpdateContentSetting(kOrigin1, GURL(), | 1750 durable_permission.UpdateContentSetting(kOrigin1, GURL(), |
1751 CONTENT_SETTING_ALLOW); | 1751 CONTENT_SETTING_ALLOW); |
(...skipping 18 matching lines...) Expand all Loading... |
1770 // Verify we only have allow for the first origin. | 1770 // Verify we only have allow for the first origin. |
1771 ContentSettingsForOneType host_settings; | 1771 ContentSettingsForOneType host_settings; |
1772 host_content_settings_map->GetSettingsForOneType( | 1772 host_content_settings_map->GetSettingsForOneType( |
1773 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, std::string(), &host_settings); | 1773 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, std::string(), &host_settings); |
1774 | 1774 |
1775 ASSERT_EQ(2u, host_settings.size()); | 1775 ASSERT_EQ(2u, host_settings.size()); |
1776 // Only the first should should have a setting. | 1776 // Only the first should should have a setting. |
1777 EXPECT_EQ(ContentSettingsPattern::FromURLNoWildcard(kOrigin1), | 1777 EXPECT_EQ(ContentSettingsPattern::FromURLNoWildcard(kOrigin1), |
1778 host_settings[0].primary_pattern) | 1778 host_settings[0].primary_pattern) |
1779 << host_settings[0].primary_pattern.ToString(); | 1779 << host_settings[0].primary_pattern.ToString(); |
1780 EXPECT_EQ(CONTENT_SETTING_ALLOW, host_settings[0].setting); | 1780 EXPECT_EQ(CONTENT_SETTING_ALLOW, host_settings[0].GetContentSetting()); |
1781 | 1781 |
1782 // And our wildcard. | 1782 // And our wildcard. |
1783 EXPECT_EQ(ContentSettingsPattern::Wildcard(), | 1783 EXPECT_EQ(ContentSettingsPattern::Wildcard(), |
1784 host_settings[1].primary_pattern) | 1784 host_settings[1].primary_pattern) |
1785 << host_settings[1].primary_pattern.ToString(); | 1785 << host_settings[1].primary_pattern.ToString(); |
1786 EXPECT_EQ(CONTENT_SETTING_ASK, host_settings[1].setting); | 1786 EXPECT_EQ(CONTENT_SETTING_ASK, host_settings[1].GetContentSetting()); |
1787 } | 1787 } |
1788 | 1788 |
1789 TEST_F(ChromeBrowsingDataRemoverDelegateTest, | 1789 TEST_F(ChromeBrowsingDataRemoverDelegateTest, |
1790 DurablePermissionIsPartOfEmbedderDOMStorage) { | 1790 DurablePermissionIsPartOfEmbedderDOMStorage) { |
1791 HostContentSettingsMap* host_content_settings_map = | 1791 HostContentSettingsMap* host_content_settings_map = |
1792 HostContentSettingsMapFactory::GetForProfile(GetProfile()); | 1792 HostContentSettingsMapFactory::GetForProfile(GetProfile()); |
1793 DurableStoragePermissionContext durable_permission(GetProfile()); | 1793 DurableStoragePermissionContext durable_permission(GetProfile()); |
1794 durable_permission.UpdateContentSetting(kOrigin1, GURL(), | 1794 durable_permission.UpdateContentSetting(kOrigin1, GURL(), |
1795 CONTENT_SETTING_ALLOW); | 1795 CONTENT_SETTING_ALLOW); |
1796 ContentSettingsForOneType host_settings; | 1796 ContentSettingsForOneType host_settings; |
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2316 base::Callback<bool(const GURL&)> origin_filter; | 2316 base::Callback<bool(const GURL&)> origin_filter; |
2317 tester.GetMockInfo(&remove_count, &data_type_mask, &origin_filter); | 2317 tester.GetMockInfo(&remove_count, &data_type_mask, &origin_filter); |
2318 | 2318 |
2319 EXPECT_EQ(1, remove_count); | 2319 EXPECT_EQ(1, remove_count); |
2320 EXPECT_EQ(net::ReportingBrowsingDataRemover::DATA_TYPE_REPORTS | | 2320 EXPECT_EQ(net::ReportingBrowsingDataRemover::DATA_TYPE_REPORTS | |
2321 net::ReportingBrowsingDataRemover::DATA_TYPE_CLIENTS, | 2321 net::ReportingBrowsingDataRemover::DATA_TYPE_CLIENTS, |
2322 data_type_mask); | 2322 data_type_mask); |
2323 EXPECT_TRUE( | 2323 EXPECT_TRUE( |
2324 ProbablySameFilters(builder->BuildGeneralFilter(), origin_filter)); | 2324 ProbablySameFilters(builder->BuildGeneralFilter(), origin_filter)); |
2325 } | 2325 } |
OLD | NEW |