| 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 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 550 password_manager::MockPasswordStore* store_; | 550 password_manager::MockPasswordStore* store_; |
| 551 | 551 |
| 552 DISALLOW_COPY_AND_ASSIGN(RemovePasswordsTester); | 552 DISALLOW_COPY_AND_ASSIGN(RemovePasswordsTester); |
| 553 }; | 553 }; |
| 554 | 554 |
| 555 class RemovePermissionPromptCountsTest { | 555 class RemovePermissionPromptCountsTest { |
| 556 public: | 556 public: |
| 557 explicit RemovePermissionPromptCountsTest(TestingProfile* profile) | 557 explicit RemovePermissionPromptCountsTest(TestingProfile* profile) |
| 558 : autoblocker_(PermissionDecisionAutoBlocker::GetForProfile(profile)) {} | 558 : autoblocker_(PermissionDecisionAutoBlocker::GetForProfile(profile)) {} |
| 559 | 559 |
| 560 int GetDismissCount(const GURL& url, content::PermissionType permission) { | 560 int GetDismissCount(const GURL& url, ContentSettingsType permission) { |
| 561 return autoblocker_->GetDismissCount(url, permission); | 561 return autoblocker_->GetDismissCount(url, permission); |
| 562 } | 562 } |
| 563 | 563 |
| 564 int GetIgnoreCount(const GURL& url, content::PermissionType permission) { | 564 int GetIgnoreCount(const GURL& url, ContentSettingsType permission) { |
| 565 return autoblocker_->GetIgnoreCount(url, permission); | 565 return autoblocker_->GetIgnoreCount(url, permission); |
| 566 } | 566 } |
| 567 | 567 |
| 568 int RecordIgnore(const GURL& url, content::PermissionType permission) { | 568 int RecordIgnore(const GURL& url, ContentSettingsType permission) { |
| 569 return autoblocker_->RecordIgnore(url, permission); | 569 return autoblocker_->RecordIgnore(url, permission); |
| 570 } | 570 } |
| 571 | 571 |
| 572 bool ShouldChangeDismissalToBlock(const GURL& url, | 572 bool ShouldChangeDismissalToBlock(const GURL& url, |
| 573 content::PermissionType permission) { | 573 ContentSettingsType permission) { |
| 574 return autoblocker_->RecordDismissAndEmbargo(url, permission); | 574 return autoblocker_->RecordDismissAndEmbargo(url, permission); |
| 575 } | 575 } |
| 576 | 576 |
| 577 private: | 577 private: |
| 578 PermissionDecisionAutoBlocker* autoblocker_; | 578 PermissionDecisionAutoBlocker* autoblocker_; |
| 579 | 579 |
| 580 DISALLOW_COPY_AND_ASSIGN(RemovePermissionPromptCountsTest); | 580 DISALLOW_COPY_AND_ASSIGN(RemovePermissionPromptCountsTest); |
| 581 }; | 581 }; |
| 582 | 582 |
| 583 #if BUILDFLAG(ENABLE_PLUGINS) | 583 #if BUILDFLAG(ENABLE_PLUGINS) |
| (...skipping 966 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1550 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST)); | 1550 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST)); |
| 1551 filter_builder_1->AddRegisterableDomain(kTestRegisterableDomain1); | 1551 filter_builder_1->AddRegisterableDomain(kTestRegisterableDomain1); |
| 1552 | 1552 |
| 1553 std::unique_ptr<BrowsingDataFilterBuilder> filter_builder_2( | 1553 std::unique_ptr<BrowsingDataFilterBuilder> filter_builder_2( |
| 1554 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST)); | 1554 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST)); |
| 1555 filter_builder_2->AddRegisterableDomain(kTestRegisterableDomain1); | 1555 filter_builder_2->AddRegisterableDomain(kTestRegisterableDomain1); |
| 1556 | 1556 |
| 1557 { | 1557 { |
| 1558 // Test REMOVE_HISTORY. | 1558 // Test REMOVE_HISTORY. |
| 1559 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, | 1559 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, |
| 1560 content::PermissionType::GEOLOCATION)); | 1560 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1561 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1, | 1561 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1, |
| 1562 content::PermissionType::GEOLOCATION)); | 1562 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1563 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, | 1563 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, |
| 1564 content::PermissionType::NOTIFICATIONS)); | 1564 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1565 tester.ShouldChangeDismissalToBlock(kOrigin1, | 1565 tester.ShouldChangeDismissalToBlock(kOrigin1, |
| 1566 content::PermissionType::MIDI_SYSEX); | 1566 CONTENT_SETTINGS_TYPE_MIDI_SYSEX); |
| 1567 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2, | 1567 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2, |
| 1568 content::PermissionType::DURABLE_STORAGE)); | 1568 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1569 tester.ShouldChangeDismissalToBlock(kOrigin2, | 1569 tester.ShouldChangeDismissalToBlock(kOrigin2, |
| 1570 content::PermissionType::NOTIFICATIONS); | 1570 CONTENT_SETTINGS_TYPE_NOTIFICATIONS); |
| 1571 | 1571 |
| 1572 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(), | 1572 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(), |
| 1573 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, | 1573 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, |
| 1574 std::move(filter_builder_1)); | 1574 std::move(filter_builder_1)); |
| 1575 | 1575 |
| 1576 // kOrigin1 should be gone, but kOrigin2 remains. | 1576 // kOrigin1 should be gone, but kOrigin2 remains. |
| 1577 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1577 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1578 content::PermissionType::GEOLOCATION)); | 1578 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1579 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1579 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1580 content::PermissionType::NOTIFICATIONS)); | 1580 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1581 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, | 1581 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, |
| 1582 content::PermissionType::MIDI_SYSEX)); | 1582 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1583 EXPECT_EQ(1, tester.GetIgnoreCount( | 1583 EXPECT_EQ(1, tester.GetIgnoreCount( |
| 1584 kOrigin2, content::PermissionType::DURABLE_STORAGE)); | 1584 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1585 EXPECT_EQ(1, tester.GetDismissCount( | 1585 EXPECT_EQ(1, tester.GetDismissCount( |
| 1586 kOrigin2, content::PermissionType::NOTIFICATIONS)); | 1586 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1587 | 1587 |
| 1588 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), | 1588 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), |
| 1589 BrowsingDataRemover::REMOVE_HISTORY, false); | 1589 BrowsingDataRemover::REMOVE_HISTORY, false); |
| 1590 | 1590 |
| 1591 // Everything should be gone. | 1591 // Everything should be gone. |
| 1592 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1592 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1593 content::PermissionType::GEOLOCATION)); | 1593 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1594 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1594 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1595 content::PermissionType::NOTIFICATIONS)); | 1595 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1596 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, | 1596 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, |
| 1597 content::PermissionType::MIDI_SYSEX)); | 1597 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1598 EXPECT_EQ(0, tester.GetIgnoreCount( | 1598 EXPECT_EQ(0, tester.GetIgnoreCount( |
| 1599 kOrigin2, content::PermissionType::DURABLE_STORAGE)); | 1599 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1600 EXPECT_EQ(0, tester.GetDismissCount( | 1600 EXPECT_EQ(0, tester.GetDismissCount( |
| 1601 kOrigin2, content::PermissionType::NOTIFICATIONS)); | 1601 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1602 } | 1602 } |
| 1603 { | 1603 { |
| 1604 // Test REMOVE_SITE_DATA. | 1604 // Test REMOVE_SITE_DATA. |
| 1605 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, | 1605 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, |
| 1606 content::PermissionType::GEOLOCATION)); | 1606 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1607 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1, | 1607 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1, |
| 1608 content::PermissionType::GEOLOCATION)); | 1608 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1609 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, | 1609 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, |
| 1610 content::PermissionType::NOTIFICATIONS)); | 1610 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1611 tester.ShouldChangeDismissalToBlock(kOrigin1, | 1611 tester.ShouldChangeDismissalToBlock(kOrigin1, |
| 1612 content::PermissionType::MIDI_SYSEX); | 1612 CONTENT_SETTINGS_TYPE_MIDI_SYSEX); |
| 1613 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2, | 1613 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2, |
| 1614 content::PermissionType::DURABLE_STORAGE)); | 1614 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1615 tester.ShouldChangeDismissalToBlock(kOrigin2, | 1615 tester.ShouldChangeDismissalToBlock(kOrigin2, |
| 1616 content::PermissionType::NOTIFICATIONS); | 1616 CONTENT_SETTINGS_TYPE_NOTIFICATIONS); |
| 1617 | 1617 |
| 1618 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(), | 1618 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(), |
| 1619 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, | 1619 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, |
| 1620 std::move(filter_builder_2)); | 1620 std::move(filter_builder_2)); |
| 1621 | 1621 |
| 1622 // kOrigin2 should be gone, but kOrigin1 remains. | 1622 // kOrigin2 should be gone, but kOrigin1 remains. |
| 1623 EXPECT_EQ(2, tester.GetIgnoreCount(kOrigin1, | 1623 EXPECT_EQ(2, tester.GetIgnoreCount(kOrigin1, |
| 1624 content::PermissionType::GEOLOCATION)); | 1624 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1625 EXPECT_EQ(1, tester.GetIgnoreCount(kOrigin1, | 1625 EXPECT_EQ(1, tester.GetIgnoreCount(kOrigin1, |
| 1626 content::PermissionType::NOTIFICATIONS)); | 1626 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1627 EXPECT_EQ(1, tester.GetDismissCount(kOrigin1, | 1627 EXPECT_EQ(1, tester.GetDismissCount(kOrigin1, |
| 1628 content::PermissionType::MIDI_SYSEX)); | 1628 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1629 EXPECT_EQ(0, tester.GetIgnoreCount( | 1629 EXPECT_EQ(0, tester.GetIgnoreCount( |
| 1630 kOrigin2, content::PermissionType::DURABLE_STORAGE)); | 1630 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1631 EXPECT_EQ(0, tester.GetDismissCount( | 1631 EXPECT_EQ(0, tester.GetDismissCount( |
| 1632 kOrigin2, content::PermissionType::NOTIFICATIONS)); | 1632 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1633 | 1633 |
| 1634 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), | 1634 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), |
| 1635 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, | 1635 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, |
| 1636 false); | 1636 false); |
| 1637 | 1637 |
| 1638 // Everything should be gone. | 1638 // Everything should be gone. |
| 1639 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1639 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1640 content::PermissionType::GEOLOCATION)); | 1640 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1641 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1641 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1642 content::PermissionType::NOTIFICATIONS)); | 1642 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1643 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, | 1643 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, |
| 1644 content::PermissionType::MIDI_SYSEX)); | 1644 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1645 EXPECT_EQ(0, tester.GetIgnoreCount( | 1645 EXPECT_EQ(0, tester.GetIgnoreCount( |
| 1646 kOrigin2, content::PermissionType::DURABLE_STORAGE)); | 1646 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1647 EXPECT_EQ(0, tester.GetDismissCount( | 1647 EXPECT_EQ(0, tester.GetDismissCount( |
| 1648 kOrigin2, content::PermissionType::NOTIFICATIONS)); | 1648 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1649 } | 1649 } |
| 1650 } | 1650 } |
| 1651 | 1651 |
| 1652 #if BUILDFLAG(ENABLE_PLUGINS) | 1652 #if BUILDFLAG(ENABLE_PLUGINS) |
| 1653 TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePluginData) { | 1653 TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePluginData) { |
| 1654 RemovePluginDataTester tester(GetProfile()); | 1654 RemovePluginDataTester tester(GetProfile()); |
| 1655 | 1655 |
| 1656 tester.AddDomain(kOrigin1.host()); | 1656 tester.AddDomain(kOrigin1.host()); |
| 1657 tester.AddDomain(kOrigin2.host()); | 1657 tester.AddDomain(kOrigin2.host()); |
| 1658 tester.AddDomain(kOrigin3.host()); | 1658 tester.AddDomain(kOrigin3.host()); |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1767 EXPECT_THAT(language_model->GetLanguageFrequency("es"), FloatEq(0.25)); | 1767 EXPECT_THAT(language_model->GetLanguageFrequency("es"), FloatEq(0.25)); |
| 1768 | 1768 |
| 1769 // Clearing the full history does the trick. | 1769 // Clearing the full history does the trick. |
| 1770 BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(), | 1770 BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(), |
| 1771 BrowsingDataRemover::REMOVE_HISTORY, false); | 1771 BrowsingDataRemover::REMOVE_HISTORY, false); |
| 1772 | 1772 |
| 1773 EXPECT_THAT(language_model->GetTopLanguages(), SizeIs(0)); | 1773 EXPECT_THAT(language_model->GetTopLanguages(), SizeIs(0)); |
| 1774 EXPECT_THAT(language_model->GetLanguageFrequency("en"), FloatEq(0.0)); | 1774 EXPECT_THAT(language_model->GetLanguageFrequency("en"), FloatEq(0.0)); |
| 1775 EXPECT_THAT(language_model->GetLanguageFrequency("es"), FloatEq(0.0)); | 1775 EXPECT_THAT(language_model->GetLanguageFrequency("es"), FloatEq(0.0)); |
| 1776 } | 1776 } |
| OLD | NEW |