| 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/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 551 password_manager::MockPasswordStore* store_; | 551 password_manager::MockPasswordStore* store_; |
| 552 | 552 |
| 553 DISALLOW_COPY_AND_ASSIGN(RemovePasswordsTester); | 553 DISALLOW_COPY_AND_ASSIGN(RemovePasswordsTester); |
| 554 }; | 554 }; |
| 555 | 555 |
| 556 class RemovePermissionPromptCountsTest { | 556 class RemovePermissionPromptCountsTest { |
| 557 public: | 557 public: |
| 558 explicit RemovePermissionPromptCountsTest(TestingProfile* profile) | 558 explicit RemovePermissionPromptCountsTest(TestingProfile* profile) |
| 559 : autoblocker_(PermissionDecisionAutoBlocker::GetForProfile(profile)) {} | 559 : autoblocker_(PermissionDecisionAutoBlocker::GetForProfile(profile)) {} |
| 560 | 560 |
| 561 int GetDismissCount(const GURL& url, content::PermissionType permission) { | 561 int GetDismissCount(const GURL& url, ContentSettingsType permission) { |
| 562 return autoblocker_->GetDismissCount(url, permission); | 562 return autoblocker_->GetDismissCount(url, permission); |
| 563 } | 563 } |
| 564 | 564 |
| 565 int GetIgnoreCount(const GURL& url, content::PermissionType permission) { | 565 int GetIgnoreCount(const GURL& url, ContentSettingsType permission) { |
| 566 return autoblocker_->GetIgnoreCount(url, permission); | 566 return autoblocker_->GetIgnoreCount(url, permission); |
| 567 } | 567 } |
| 568 | 568 |
| 569 int RecordIgnore(const GURL& url, content::PermissionType permission) { | 569 int RecordIgnore(const GURL& url, ContentSettingsType permission) { |
| 570 return autoblocker_->RecordIgnore(url, permission); | 570 return autoblocker_->RecordIgnore(url, permission); |
| 571 } | 571 } |
| 572 | 572 |
| 573 bool ShouldChangeDismissalToBlock(const GURL& url, | 573 bool ShouldChangeDismissalToBlock(const GURL& url, |
| 574 content::PermissionType permission) { | 574 ContentSettingsType permission) { |
| 575 return autoblocker_->RecordDismissAndEmbargo(url, permission); | 575 return autoblocker_->RecordDismissAndEmbargo(url, permission); |
| 576 } | 576 } |
| 577 | 577 |
| 578 private: | 578 private: |
| 579 PermissionDecisionAutoBlocker* autoblocker_; | 579 PermissionDecisionAutoBlocker* autoblocker_; |
| 580 | 580 |
| 581 DISALLOW_COPY_AND_ASSIGN(RemovePermissionPromptCountsTest); | 581 DISALLOW_COPY_AND_ASSIGN(RemovePermissionPromptCountsTest); |
| 582 }; | 582 }; |
| 583 | 583 |
| 584 #if BUILDFLAG(ENABLE_PLUGINS) | 584 #if BUILDFLAG(ENABLE_PLUGINS) |
| (...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1568 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST)); | 1568 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST)); |
| 1569 filter_builder_1->AddRegisterableDomain(kTestRegisterableDomain1); | 1569 filter_builder_1->AddRegisterableDomain(kTestRegisterableDomain1); |
| 1570 | 1570 |
| 1571 std::unique_ptr<BrowsingDataFilterBuilder> filter_builder_2( | 1571 std::unique_ptr<BrowsingDataFilterBuilder> filter_builder_2( |
| 1572 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST)); | 1572 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST)); |
| 1573 filter_builder_2->AddRegisterableDomain(kTestRegisterableDomain1); | 1573 filter_builder_2->AddRegisterableDomain(kTestRegisterableDomain1); |
| 1574 | 1574 |
| 1575 { | 1575 { |
| 1576 // Test REMOVE_HISTORY. | 1576 // Test REMOVE_HISTORY. |
| 1577 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, | 1577 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, |
| 1578 content::PermissionType::GEOLOCATION)); | 1578 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1579 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1, | 1579 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1, |
| 1580 content::PermissionType::GEOLOCATION)); | 1580 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1581 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, | 1581 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, |
| 1582 content::PermissionType::NOTIFICATIONS)); | 1582 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1583 tester.ShouldChangeDismissalToBlock(kOrigin1, | 1583 tester.ShouldChangeDismissalToBlock(kOrigin1, |
| 1584 content::PermissionType::MIDI_SYSEX); | 1584 CONTENT_SETTINGS_TYPE_MIDI_SYSEX); |
| 1585 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2, | 1585 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2, |
| 1586 content::PermissionType::DURABLE_STORAGE)); | 1586 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1587 tester.ShouldChangeDismissalToBlock(kOrigin2, | 1587 tester.ShouldChangeDismissalToBlock(kOrigin2, |
| 1588 content::PermissionType::NOTIFICATIONS); | 1588 CONTENT_SETTINGS_TYPE_NOTIFICATIONS); |
| 1589 | 1589 |
| 1590 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(), | 1590 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(), |
| 1591 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, | 1591 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, |
| 1592 std::move(filter_builder_1)); | 1592 std::move(filter_builder_1)); |
| 1593 | 1593 |
| 1594 // kOrigin1 should be gone, but kOrigin2 remains. | 1594 // kOrigin1 should be gone, but kOrigin2 remains. |
| 1595 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1595 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1596 content::PermissionType::GEOLOCATION)); | 1596 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1597 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1597 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1598 content::PermissionType::NOTIFICATIONS)); | 1598 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1599 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, | 1599 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, |
| 1600 content::PermissionType::MIDI_SYSEX)); | 1600 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1601 EXPECT_EQ(1, tester.GetIgnoreCount( | 1601 EXPECT_EQ(1, tester.GetIgnoreCount( |
| 1602 kOrigin2, content::PermissionType::DURABLE_STORAGE)); | 1602 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1603 EXPECT_EQ(1, tester.GetDismissCount( | 1603 EXPECT_EQ(1, tester.GetDismissCount( |
| 1604 kOrigin2, content::PermissionType::NOTIFICATIONS)); | 1604 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1605 | 1605 |
| 1606 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), | 1606 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), |
| 1607 BrowsingDataRemover::REMOVE_HISTORY, false); | 1607 BrowsingDataRemover::REMOVE_HISTORY, false); |
| 1608 | 1608 |
| 1609 // Everything should be gone. | 1609 // Everything should be gone. |
| 1610 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1610 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1611 content::PermissionType::GEOLOCATION)); | 1611 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1612 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1612 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1613 content::PermissionType::NOTIFICATIONS)); | 1613 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1614 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, | 1614 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, |
| 1615 content::PermissionType::MIDI_SYSEX)); | 1615 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1616 EXPECT_EQ(0, tester.GetIgnoreCount( | 1616 EXPECT_EQ(0, tester.GetIgnoreCount( |
| 1617 kOrigin2, content::PermissionType::DURABLE_STORAGE)); | 1617 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1618 EXPECT_EQ(0, tester.GetDismissCount( | 1618 EXPECT_EQ(0, tester.GetDismissCount( |
| 1619 kOrigin2, content::PermissionType::NOTIFICATIONS)); | 1619 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1620 } | 1620 } |
| 1621 { | 1621 { |
| 1622 // Test REMOVE_SITE_DATA. | 1622 // Test REMOVE_SITE_DATA. |
| 1623 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, | 1623 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, |
| 1624 content::PermissionType::GEOLOCATION)); | 1624 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1625 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1, | 1625 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1, |
| 1626 content::PermissionType::GEOLOCATION)); | 1626 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1627 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, | 1627 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, |
| 1628 content::PermissionType::NOTIFICATIONS)); | 1628 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1629 tester.ShouldChangeDismissalToBlock(kOrigin1, | 1629 tester.ShouldChangeDismissalToBlock(kOrigin1, |
| 1630 content::PermissionType::MIDI_SYSEX); | 1630 CONTENT_SETTINGS_TYPE_MIDI_SYSEX); |
| 1631 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2, | 1631 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2, |
| 1632 content::PermissionType::DURABLE_STORAGE)); | 1632 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1633 tester.ShouldChangeDismissalToBlock(kOrigin2, | 1633 tester.ShouldChangeDismissalToBlock(kOrigin2, |
| 1634 content::PermissionType::NOTIFICATIONS); | 1634 CONTENT_SETTINGS_TYPE_NOTIFICATIONS); |
| 1635 | 1635 |
| 1636 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(), | 1636 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(), |
| 1637 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, | 1637 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, |
| 1638 std::move(filter_builder_2)); | 1638 std::move(filter_builder_2)); |
| 1639 | 1639 |
| 1640 // kOrigin2 should be gone, but kOrigin1 remains. | 1640 // kOrigin2 should be gone, but kOrigin1 remains. |
| 1641 EXPECT_EQ(2, tester.GetIgnoreCount(kOrigin1, | 1641 EXPECT_EQ(2, tester.GetIgnoreCount(kOrigin1, |
| 1642 content::PermissionType::GEOLOCATION)); | 1642 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1643 EXPECT_EQ(1, tester.GetIgnoreCount(kOrigin1, | 1643 EXPECT_EQ(1, tester.GetIgnoreCount(kOrigin1, |
| 1644 content::PermissionType::NOTIFICATIONS)); | 1644 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1645 EXPECT_EQ(1, tester.GetDismissCount(kOrigin1, | 1645 EXPECT_EQ(1, tester.GetDismissCount(kOrigin1, |
| 1646 content::PermissionType::MIDI_SYSEX)); | 1646 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1647 EXPECT_EQ(0, tester.GetIgnoreCount( | 1647 EXPECT_EQ(0, tester.GetIgnoreCount( |
| 1648 kOrigin2, content::PermissionType::DURABLE_STORAGE)); | 1648 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1649 EXPECT_EQ(0, tester.GetDismissCount( | 1649 EXPECT_EQ(0, tester.GetDismissCount( |
| 1650 kOrigin2, content::PermissionType::NOTIFICATIONS)); | 1650 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1651 | 1651 |
| 1652 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), | 1652 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), |
| 1653 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, | 1653 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, |
| 1654 false); | 1654 false); |
| 1655 | 1655 |
| 1656 // Everything should be gone. | 1656 // Everything should be gone. |
| 1657 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1657 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1658 content::PermissionType::GEOLOCATION)); | 1658 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1659 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1659 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1660 content::PermissionType::NOTIFICATIONS)); | 1660 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1661 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, | 1661 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, |
| 1662 content::PermissionType::MIDI_SYSEX)); | 1662 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1663 EXPECT_EQ(0, tester.GetIgnoreCount( | 1663 EXPECT_EQ(0, tester.GetIgnoreCount( |
| 1664 kOrigin2, content::PermissionType::DURABLE_STORAGE)); | 1664 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1665 EXPECT_EQ(0, tester.GetDismissCount( | 1665 EXPECT_EQ(0, tester.GetDismissCount( |
| 1666 kOrigin2, content::PermissionType::NOTIFICATIONS)); | 1666 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1667 } | 1667 } |
| 1668 } | 1668 } |
| 1669 | 1669 |
| 1670 #if BUILDFLAG(ENABLE_PLUGINS) | 1670 #if BUILDFLAG(ENABLE_PLUGINS) |
| 1671 TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePluginData) { | 1671 TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePluginData) { |
| 1672 RemovePluginDataTester tester(GetProfile()); | 1672 RemovePluginDataTester tester(GetProfile()); |
| 1673 | 1673 |
| 1674 tester.AddDomain(kOrigin1.host()); | 1674 tester.AddDomain(kOrigin1.host()); |
| 1675 tester.AddDomain(kOrigin2.host()); | 1675 tester.AddDomain(kOrigin2.host()); |
| 1676 tester.AddDomain(kOrigin3.host()); | 1676 tester.AddDomain(kOrigin3.host()); |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1785 EXPECT_THAT(language_model->GetLanguageFrequency("es"), FloatEq(0.25)); | 1785 EXPECT_THAT(language_model->GetLanguageFrequency("es"), FloatEq(0.25)); |
| 1786 | 1786 |
| 1787 // Clearing the full history does the trick. | 1787 // Clearing the full history does the trick. |
| 1788 BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(), | 1788 BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(), |
| 1789 BrowsingDataRemover::REMOVE_HISTORY, false); | 1789 BrowsingDataRemover::REMOVE_HISTORY, false); |
| 1790 | 1790 |
| 1791 EXPECT_THAT(language_model->GetTopLanguages(), SizeIs(0)); | 1791 EXPECT_THAT(language_model->GetTopLanguages(), SizeIs(0)); |
| 1792 EXPECT_THAT(language_model->GetLanguageFrequency("en"), FloatEq(0.0)); | 1792 EXPECT_THAT(language_model->GetLanguageFrequency("en"), FloatEq(0.0)); |
| 1793 EXPECT_THAT(language_model->GetLanguageFrequency("es"), FloatEq(0.0)); | 1793 EXPECT_THAT(language_model->GetLanguageFrequency("es"), FloatEq(0.0)); |
| 1794 } | 1794 } |
| OLD | NEW |