| 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" |
| 11 #include "base/test/scoped_feature_list.h" |
| 11 #include "base/time/time.h" | 12 #include "base/time/time.h" |
| 12 #include "chrome/browser/autofill/personal_data_manager_factory.h" | 13 #include "chrome/browser/autofill/personal_data_manager_factory.h" |
| 13 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 14 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 14 #include "chrome/browser/browsing_data/browsing_data_helper.h" | 15 #include "chrome/browser/browsing_data/browsing_data_helper.h" |
| 15 #include "chrome/browser/browsing_data/browsing_data_remover.h" | 16 #include "chrome/browser/browsing_data/browsing_data_remover.h" |
| 16 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" | 17 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" |
| 17 #include "chrome/browser/browsing_data/browsing_data_remover_impl.h" | 18 #include "chrome/browser/browsing_data/browsing_data_remover_impl.h" |
| 18 #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h" | 19 #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h" |
| 19 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" | 20 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" |
| 20 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 21 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
| 21 #include "chrome/browser/domain_reliability/service_factory.h" | 22 #include "chrome/browser/domain_reliability/service_factory.h" |
| 22 #include "chrome/browser/download/chrome_download_manager_delegate.h" | 23 #include "chrome/browser/download/chrome_download_manager_delegate.h" |
| 23 #include "chrome/browser/favicon/favicon_service_factory.h" | 24 #include "chrome/browser/favicon/favicon_service_factory.h" |
| 24 #include "chrome/browser/history/history_service_factory.h" | 25 #include "chrome/browser/history/history_service_factory.h" |
| 25 #include "chrome/browser/password_manager/password_store_factory.h" | 26 #include "chrome/browser/password_manager/password_store_factory.h" |
| 26 #include "chrome/browser/permissions/permission_decision_auto_blocker.h" | 27 #include "chrome/browser/permissions/permission_decision_auto_blocker.h" |
| 27 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 28 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 28 #include "chrome/browser/storage/durable_storage_permission_context.h" | 29 #include "chrome/browser/storage/durable_storage_permission_context.h" |
| 29 #include "chrome/browser/translate/language_model_factory.h" | 30 #include "chrome/browser/translate/language_model_factory.h" |
| 31 #include "chrome/common/chrome_features.h" |
| 30 #include "chrome/common/pref_names.h" | 32 #include "chrome/common/pref_names.h" |
| 31 #include "chrome/test/base/testing_browser_process.h" | 33 #include "chrome/test/base/testing_browser_process.h" |
| 32 #include "chrome/test/base/testing_profile.h" | 34 #include "chrome/test/base/testing_profile.h" |
| 33 #include "components/autofill/core/browser/autofill_profile.h" | 35 #include "components/autofill/core/browser/autofill_profile.h" |
| 34 #include "components/autofill/core/browser/autofill_test_utils.h" | 36 #include "components/autofill/core/browser/autofill_test_utils.h" |
| 35 #include "components/autofill/core/browser/credit_card.h" | 37 #include "components/autofill/core/browser/credit_card.h" |
| 36 #include "components/autofill/core/browser/personal_data_manager.h" | 38 #include "components/autofill/core/browser/personal_data_manager.h" |
| 37 #include "components/autofill/core/browser/personal_data_manager_observer.h" | 39 #include "components/autofill/core/browser/personal_data_manager_observer.h" |
| 38 #include "components/autofill/core/common/autofill_constants.h" | 40 #include "components/autofill/core/common/autofill_constants.h" |
| 39 #include "components/bookmarks/browser/bookmark_model.h" | 41 #include "components/bookmarks/browser/bookmark_model.h" |
| (...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 563 } | 565 } |
| 564 | 566 |
| 565 int GetIgnoreCount(const GURL& url, ContentSettingsType permission) { | 567 int GetIgnoreCount(const GURL& url, ContentSettingsType permission) { |
| 566 return autoblocker_->GetIgnoreCount(url, permission); | 568 return autoblocker_->GetIgnoreCount(url, permission); |
| 567 } | 569 } |
| 568 | 570 |
| 569 int RecordIgnore(const GURL& url, ContentSettingsType permission) { | 571 int RecordIgnore(const GURL& url, ContentSettingsType permission) { |
| 570 return autoblocker_->RecordIgnore(url, permission); | 572 return autoblocker_->RecordIgnore(url, permission); |
| 571 } | 573 } |
| 572 | 574 |
| 573 bool ShouldChangeDismissalToBlock(const GURL& url, | 575 bool RecordDismissAndEmbargo(const GURL& url, |
| 574 ContentSettingsType permission) { | 576 ContentSettingsType permission) { |
| 575 return autoblocker_->RecordDismissAndEmbargo(url, permission); | 577 return autoblocker_->RecordDismissAndEmbargo(url, permission); |
| 576 } | 578 } |
| 577 | 579 |
| 580 void CheckEmbargo(const GURL& url, |
| 581 ContentSettingsType permission, |
| 582 ContentSetting expected_setting) { |
| 583 EXPECT_EQ(expected_setting, |
| 584 autoblocker_->GetEmbargoResult(permission, url).content_setting); |
| 585 } |
| 586 |
| 578 private: | 587 private: |
| 579 PermissionDecisionAutoBlocker* autoblocker_; | 588 PermissionDecisionAutoBlocker* autoblocker_; |
| 580 | 589 |
| 581 DISALLOW_COPY_AND_ASSIGN(RemovePermissionPromptCountsTest); | 590 DISALLOW_COPY_AND_ASSIGN(RemovePermissionPromptCountsTest); |
| 582 }; | 591 }; |
| 583 | 592 |
| 584 #if BUILDFLAG(ENABLE_PLUGINS) | 593 #if BUILDFLAG(ENABLE_PLUGINS) |
| 585 // A small modification to MockBrowsingDataFlashLSOHelper so that it responds | 594 // A small modification to MockBrowsingDataFlashLSOHelper so that it responds |
| 586 // immediately and does not wait for the Notify() call. Otherwise it would | 595 // immediately and does not wait for the Notify() call. Otherwise it would |
| 587 // deadlock BrowsingDataRemoverImpl::RemoveImpl. | 596 // deadlock BrowsingDataRemoverImpl::RemoveImpl. |
| (...skipping 976 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1564 TEST_F(ChromeBrowsingDataRemoverDelegateTest, ClearPermissionPromptCounts) { | 1573 TEST_F(ChromeBrowsingDataRemoverDelegateTest, ClearPermissionPromptCounts) { |
| 1565 RemovePermissionPromptCountsTest tester(GetProfile()); | 1574 RemovePermissionPromptCountsTest tester(GetProfile()); |
| 1566 | 1575 |
| 1567 std::unique_ptr<BrowsingDataFilterBuilder> filter_builder_1( | 1576 std::unique_ptr<BrowsingDataFilterBuilder> filter_builder_1( |
| 1568 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST)); | 1577 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST)); |
| 1569 filter_builder_1->AddRegisterableDomain(kTestRegisterableDomain1); | 1578 filter_builder_1->AddRegisterableDomain(kTestRegisterableDomain1); |
| 1570 | 1579 |
| 1571 std::unique_ptr<BrowsingDataFilterBuilder> filter_builder_2( | 1580 std::unique_ptr<BrowsingDataFilterBuilder> filter_builder_2( |
| 1572 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST)); | 1581 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST)); |
| 1573 filter_builder_2->AddRegisterableDomain(kTestRegisterableDomain1); | 1582 filter_builder_2->AddRegisterableDomain(kTestRegisterableDomain1); |
| 1583 base::test::ScopedFeatureList feature_list; |
| 1584 feature_list.InitWithFeatures({features::kBlockPromptsIfDismissedOften}, {}); |
| 1574 | 1585 |
| 1575 { | 1586 { |
| 1576 // Test REMOVE_HISTORY. | 1587 // Test REMOVE_HISTORY. |
| 1577 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, | 1588 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, |
| 1578 CONTENT_SETTINGS_TYPE_GEOLOCATION)); | 1589 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1579 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1, | 1590 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1, |
| 1580 CONTENT_SETTINGS_TYPE_GEOLOCATION)); | 1591 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1581 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, | 1592 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, |
| 1582 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); | 1593 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1583 tester.ShouldChangeDismissalToBlock(kOrigin1, | 1594 EXPECT_FALSE(tester.RecordDismissAndEmbargo( |
| 1584 CONTENT_SETTINGS_TYPE_MIDI_SYSEX); | 1595 kOrigin1, CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1585 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2, | 1596 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2, |
| 1586 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); | 1597 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1587 tester.ShouldChangeDismissalToBlock(kOrigin2, | 1598 tester.CheckEmbargo(kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, |
| 1588 CONTENT_SETTINGS_TYPE_NOTIFICATIONS); | 1599 CONTENT_SETTING_ASK); |
| 1600 EXPECT_FALSE(tester.RecordDismissAndEmbargo( |
| 1601 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1602 EXPECT_FALSE(tester.RecordDismissAndEmbargo( |
| 1603 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1604 EXPECT_TRUE(tester.RecordDismissAndEmbargo( |
| 1605 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1606 tester.CheckEmbargo(kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, |
| 1607 CONTENT_SETTING_BLOCK); |
| 1589 | 1608 |
| 1590 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(), | 1609 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(), |
| 1591 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, | 1610 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, |
| 1592 std::move(filter_builder_1)); | 1611 std::move(filter_builder_1)); |
| 1593 | 1612 |
| 1594 // kOrigin1 should be gone, but kOrigin2 remains. | 1613 // kOrigin1 should be gone, but kOrigin2 remains. |
| 1595 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1614 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1596 CONTENT_SETTINGS_TYPE_GEOLOCATION)); | 1615 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1597 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1616 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1598 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); | 1617 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1599 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, | 1618 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, |
| 1600 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); | 1619 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1601 EXPECT_EQ(1, tester.GetIgnoreCount( | 1620 EXPECT_EQ(1, tester.GetIgnoreCount( |
| 1602 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); | 1621 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1603 EXPECT_EQ(1, tester.GetDismissCount( | 1622 EXPECT_EQ(3, tester.GetDismissCount(kOrigin2, |
| 1604 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); | 1623 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1624 tester.CheckEmbargo(kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, |
| 1625 CONTENT_SETTING_BLOCK); |
| 1605 | 1626 |
| 1606 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), | 1627 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), |
| 1607 BrowsingDataRemover::REMOVE_HISTORY, false); | 1628 BrowsingDataRemover::REMOVE_HISTORY, false); |
| 1608 | 1629 |
| 1609 // Everything should be gone. | 1630 // Everything should be gone. |
| 1610 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1631 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1611 CONTENT_SETTINGS_TYPE_GEOLOCATION)); | 1632 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1612 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1633 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1613 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); | 1634 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1614 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, | 1635 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, |
| 1615 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); | 1636 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1616 EXPECT_EQ(0, tester.GetIgnoreCount( | 1637 EXPECT_EQ(0, tester.GetIgnoreCount( |
| 1617 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); | 1638 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1618 EXPECT_EQ(0, tester.GetDismissCount( | 1639 EXPECT_EQ(0, tester.GetDismissCount( |
| 1619 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); | 1640 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1641 tester.CheckEmbargo(kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, |
| 1642 CONTENT_SETTING_ASK); |
| 1620 } | 1643 } |
| 1621 { | 1644 { |
| 1622 // Test REMOVE_SITE_DATA. | 1645 // Test REMOVE_SITE_DATA. |
| 1623 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, | 1646 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, |
| 1624 CONTENT_SETTINGS_TYPE_GEOLOCATION)); | 1647 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1625 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1, | 1648 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1, |
| 1626 CONTENT_SETTINGS_TYPE_GEOLOCATION)); | 1649 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1627 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, | 1650 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, |
| 1628 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); | 1651 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1629 tester.ShouldChangeDismissalToBlock(kOrigin1, | 1652 EXPECT_FALSE(tester.RecordDismissAndEmbargo( |
| 1630 CONTENT_SETTINGS_TYPE_MIDI_SYSEX); | 1653 kOrigin1, CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1654 tester.CheckEmbargo(kOrigin1, CONTENT_SETTINGS_TYPE_MIDI_SYSEX, |
| 1655 CONTENT_SETTING_ASK); |
| 1631 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2, | 1656 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2, |
| 1632 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); | 1657 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1633 tester.ShouldChangeDismissalToBlock(kOrigin2, | 1658 EXPECT_FALSE(tester.RecordDismissAndEmbargo( |
| 1634 CONTENT_SETTINGS_TYPE_NOTIFICATIONS); | 1659 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1635 | 1660 |
| 1636 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(), | 1661 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(), |
| 1637 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, | 1662 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, |
| 1638 std::move(filter_builder_2)); | 1663 std::move(filter_builder_2)); |
| 1639 | 1664 |
| 1640 // kOrigin2 should be gone, but kOrigin1 remains. | 1665 // kOrigin2 should be gone, but kOrigin1 remains. |
| 1641 EXPECT_EQ(2, tester.GetIgnoreCount(kOrigin1, | 1666 EXPECT_EQ(2, tester.GetIgnoreCount(kOrigin1, |
| 1642 CONTENT_SETTINGS_TYPE_GEOLOCATION)); | 1667 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1643 EXPECT_EQ(1, tester.GetIgnoreCount(kOrigin1, | 1668 EXPECT_EQ(1, tester.GetIgnoreCount(kOrigin1, |
| 1644 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); | 1669 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1645 EXPECT_EQ(1, tester.GetDismissCount(kOrigin1, | 1670 EXPECT_EQ(1, tester.GetDismissCount(kOrigin1, |
| 1646 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); | 1671 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1647 EXPECT_EQ(0, tester.GetIgnoreCount( | 1672 EXPECT_EQ(0, tester.GetIgnoreCount( |
| 1648 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); | 1673 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1649 EXPECT_EQ(0, tester.GetDismissCount( | 1674 EXPECT_EQ(0, tester.GetDismissCount( |
| 1650 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); | 1675 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1651 | 1676 |
| 1677 EXPECT_FALSE(tester.RecordDismissAndEmbargo( |
| 1678 kOrigin1, CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1679 EXPECT_TRUE(tester.RecordDismissAndEmbargo( |
| 1680 kOrigin1, CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1681 EXPECT_EQ( |
| 1682 3, tester.GetDismissCount(kOrigin1, CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1683 tester.CheckEmbargo(kOrigin1, CONTENT_SETTINGS_TYPE_MIDI_SYSEX, |
| 1684 CONTENT_SETTING_BLOCK); |
| 1685 |
| 1652 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), | 1686 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), |
| 1653 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, | 1687 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, |
| 1654 false); | 1688 false); |
| 1655 | 1689 |
| 1656 // Everything should be gone. | 1690 // Everything should be gone. |
| 1657 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1691 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1658 CONTENT_SETTINGS_TYPE_GEOLOCATION)); | 1692 CONTENT_SETTINGS_TYPE_GEOLOCATION)); |
| 1659 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, | 1693 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, |
| 1660 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); | 1694 CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1661 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, | 1695 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, |
| 1662 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); | 1696 CONTENT_SETTINGS_TYPE_MIDI_SYSEX)); |
| 1663 EXPECT_EQ(0, tester.GetIgnoreCount( | 1697 EXPECT_EQ(0, tester.GetIgnoreCount( |
| 1664 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); | 1698 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE)); |
| 1665 EXPECT_EQ(0, tester.GetDismissCount( | 1699 EXPECT_EQ(0, tester.GetDismissCount( |
| 1666 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); | 1700 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); |
| 1701 tester.CheckEmbargo(kOrigin1, CONTENT_SETTINGS_TYPE_MIDI_SYSEX, |
| 1702 CONTENT_SETTING_ASK); |
| 1667 } | 1703 } |
| 1668 } | 1704 } |
| 1669 | 1705 |
| 1670 #if BUILDFLAG(ENABLE_PLUGINS) | 1706 #if BUILDFLAG(ENABLE_PLUGINS) |
| 1671 TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePluginData) { | 1707 TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePluginData) { |
| 1672 RemovePluginDataTester tester(GetProfile()); | 1708 RemovePluginDataTester tester(GetProfile()); |
| 1673 | 1709 |
| 1674 tester.AddDomain(kOrigin1.host()); | 1710 tester.AddDomain(kOrigin1.host()); |
| 1675 tester.AddDomain(kOrigin2.host()); | 1711 tester.AddDomain(kOrigin2.host()); |
| 1676 tester.AddDomain(kOrigin3.host()); | 1712 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)); | 1821 EXPECT_THAT(language_model->GetLanguageFrequency("es"), FloatEq(0.25)); |
| 1786 | 1822 |
| 1787 // Clearing the full history does the trick. | 1823 // Clearing the full history does the trick. |
| 1788 BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(), | 1824 BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(), |
| 1789 BrowsingDataRemover::REMOVE_HISTORY, false); | 1825 BrowsingDataRemover::REMOVE_HISTORY, false); |
| 1790 | 1826 |
| 1791 EXPECT_THAT(language_model->GetTopLanguages(), SizeIs(0)); | 1827 EXPECT_THAT(language_model->GetTopLanguages(), SizeIs(0)); |
| 1792 EXPECT_THAT(language_model->GetLanguageFrequency("en"), FloatEq(0.0)); | 1828 EXPECT_THAT(language_model->GetLanguageFrequency("en"), FloatEq(0.0)); |
| 1793 EXPECT_THAT(language_model->GetLanguageFrequency("es"), FloatEq(0.0)); | 1829 EXPECT_THAT(language_model->GetLanguageFrequency("es"), FloatEq(0.0)); |
| 1794 } | 1830 } |
| OLD | NEW |