Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Side by Side Diff: chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 966 matching lines...) Expand 10 before | Expand all | Expand 10 after
1551 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST)); 1551 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::WHITELIST));
1552 filter_builder_1->AddRegisterableDomain(kTestRegisterableDomain1); 1552 filter_builder_1->AddRegisterableDomain(kTestRegisterableDomain1);
1553 1553
1554 std::unique_ptr<BrowsingDataFilterBuilder> filter_builder_2( 1554 std::unique_ptr<BrowsingDataFilterBuilder> filter_builder_2(
1555 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST)); 1555 BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST));
1556 filter_builder_2->AddRegisterableDomain(kTestRegisterableDomain1); 1556 filter_builder_2->AddRegisterableDomain(kTestRegisterableDomain1);
1557 1557
1558 { 1558 {
1559 // Test REMOVE_HISTORY. 1559 // Test REMOVE_HISTORY.
1560 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, 1560 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
1561 content::PermissionType::GEOLOCATION)); 1561 CONTENT_SETTINGS_TYPE_GEOLOCATION));
1562 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1, 1562 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1,
1563 content::PermissionType::GEOLOCATION)); 1563 CONTENT_SETTINGS_TYPE_GEOLOCATION));
1564 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, 1564 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
1565 content::PermissionType::NOTIFICATIONS)); 1565 CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
1566 tester.ShouldChangeDismissalToBlock(kOrigin1, 1566 tester.ShouldChangeDismissalToBlock(kOrigin1,
1567 content::PermissionType::MIDI_SYSEX); 1567 CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
1568 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2, 1568 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2,
1569 content::PermissionType::DURABLE_STORAGE)); 1569 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
1570 tester.ShouldChangeDismissalToBlock(kOrigin2, 1570 tester.ShouldChangeDismissalToBlock(kOrigin2,
1571 content::PermissionType::NOTIFICATIONS); 1571 CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
1572 1572
1573 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(), 1573 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
1574 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, 1574 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
1575 std::move(filter_builder_1)); 1575 std::move(filter_builder_1));
1576 1576
1577 // kOrigin1 should be gone, but kOrigin2 remains. 1577 // kOrigin1 should be gone, but kOrigin2 remains.
1578 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, 1578 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
1579 content::PermissionType::GEOLOCATION)); 1579 CONTENT_SETTINGS_TYPE_GEOLOCATION));
1580 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, 1580 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
1581 content::PermissionType::NOTIFICATIONS)); 1581 CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
1582 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, 1582 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1,
1583 content::PermissionType::MIDI_SYSEX)); 1583 CONTENT_SETTINGS_TYPE_MIDI_SYSEX));
1584 EXPECT_EQ(1, tester.GetIgnoreCount( 1584 EXPECT_EQ(1, tester.GetIgnoreCount(
1585 kOrigin2, content::PermissionType::DURABLE_STORAGE)); 1585 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
1586 EXPECT_EQ(1, tester.GetDismissCount( 1586 EXPECT_EQ(1, tester.GetDismissCount(
1587 kOrigin2, content::PermissionType::NOTIFICATIONS)); 1587 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
1588 1588
1589 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), 1589 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
1590 BrowsingDataRemover::REMOVE_HISTORY, false); 1590 BrowsingDataRemover::REMOVE_HISTORY, false);
1591 1591
1592 // Everything should be gone. 1592 // Everything should be gone.
1593 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, 1593 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
1594 content::PermissionType::GEOLOCATION)); 1594 CONTENT_SETTINGS_TYPE_GEOLOCATION));
1595 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, 1595 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
1596 content::PermissionType::NOTIFICATIONS)); 1596 CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
1597 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, 1597 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1,
1598 content::PermissionType::MIDI_SYSEX)); 1598 CONTENT_SETTINGS_TYPE_MIDI_SYSEX));
1599 EXPECT_EQ(0, tester.GetIgnoreCount( 1599 EXPECT_EQ(0, tester.GetIgnoreCount(
1600 kOrigin2, content::PermissionType::DURABLE_STORAGE)); 1600 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
1601 EXPECT_EQ(0, tester.GetDismissCount( 1601 EXPECT_EQ(0, tester.GetDismissCount(
1602 kOrigin2, content::PermissionType::NOTIFICATIONS)); 1602 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
1603 } 1603 }
1604 { 1604 {
1605 // Test REMOVE_SITE_DATA. 1605 // Test REMOVE_SITE_DATA.
1606 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, 1606 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
1607 content::PermissionType::GEOLOCATION)); 1607 CONTENT_SETTINGS_TYPE_GEOLOCATION));
1608 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1, 1608 EXPECT_EQ(2, tester.RecordIgnore(kOrigin1,
1609 content::PermissionType::GEOLOCATION)); 1609 CONTENT_SETTINGS_TYPE_GEOLOCATION));
1610 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1, 1610 EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
1611 content::PermissionType::NOTIFICATIONS)); 1611 CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
1612 tester.ShouldChangeDismissalToBlock(kOrigin1, 1612 tester.ShouldChangeDismissalToBlock(kOrigin1,
1613 content::PermissionType::MIDI_SYSEX); 1613 CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
1614 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2, 1614 EXPECT_EQ(1, tester.RecordIgnore(kOrigin2,
1615 content::PermissionType::DURABLE_STORAGE)); 1615 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
1616 tester.ShouldChangeDismissalToBlock(kOrigin2, 1616 tester.ShouldChangeDismissalToBlock(kOrigin2,
1617 content::PermissionType::NOTIFICATIONS); 1617 CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
1618 1618
1619 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(), 1619 BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
1620 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, 1620 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
1621 std::move(filter_builder_2)); 1621 std::move(filter_builder_2));
1622 1622
1623 // kOrigin2 should be gone, but kOrigin1 remains. 1623 // kOrigin2 should be gone, but kOrigin1 remains.
1624 EXPECT_EQ(2, tester.GetIgnoreCount(kOrigin1, 1624 EXPECT_EQ(2, tester.GetIgnoreCount(kOrigin1,
1625 content::PermissionType::GEOLOCATION)); 1625 CONTENT_SETTINGS_TYPE_GEOLOCATION));
1626 EXPECT_EQ(1, tester.GetIgnoreCount(kOrigin1, 1626 EXPECT_EQ(1, tester.GetIgnoreCount(kOrigin1,
1627 content::PermissionType::NOTIFICATIONS)); 1627 CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
1628 EXPECT_EQ(1, tester.GetDismissCount(kOrigin1, 1628 EXPECT_EQ(1, tester.GetDismissCount(kOrigin1,
1629 content::PermissionType::MIDI_SYSEX)); 1629 CONTENT_SETTINGS_TYPE_MIDI_SYSEX));
1630 EXPECT_EQ(0, tester.GetIgnoreCount( 1630 EXPECT_EQ(0, tester.GetIgnoreCount(
1631 kOrigin2, content::PermissionType::DURABLE_STORAGE)); 1631 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
1632 EXPECT_EQ(0, tester.GetDismissCount( 1632 EXPECT_EQ(0, tester.GetDismissCount(
1633 kOrigin2, content::PermissionType::NOTIFICATIONS)); 1633 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
1634 1634
1635 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(), 1635 BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
1636 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA, 1636 BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
1637 false); 1637 false);
1638 1638
1639 // Everything should be gone. 1639 // Everything should be gone.
1640 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, 1640 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
1641 content::PermissionType::GEOLOCATION)); 1641 CONTENT_SETTINGS_TYPE_GEOLOCATION));
1642 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1, 1642 EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
1643 content::PermissionType::NOTIFICATIONS)); 1643 CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
1644 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1, 1644 EXPECT_EQ(0, tester.GetDismissCount(kOrigin1,
1645 content::PermissionType::MIDI_SYSEX)); 1645 CONTENT_SETTINGS_TYPE_MIDI_SYSEX));
1646 EXPECT_EQ(0, tester.GetIgnoreCount( 1646 EXPECT_EQ(0, tester.GetIgnoreCount(
1647 kOrigin2, content::PermissionType::DURABLE_STORAGE)); 1647 kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
1648 EXPECT_EQ(0, tester.GetDismissCount( 1648 EXPECT_EQ(0, tester.GetDismissCount(
1649 kOrigin2, content::PermissionType::NOTIFICATIONS)); 1649 kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
1650 } 1650 }
1651 } 1651 }
1652 1652
1653 #if BUILDFLAG(ENABLE_PLUGINS) 1653 #if BUILDFLAG(ENABLE_PLUGINS)
1654 TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePluginData) { 1654 TEST_F(ChromeBrowsingDataRemoverDelegateTest, RemovePluginData) {
1655 RemovePluginDataTester tester(GetProfile()); 1655 RemovePluginDataTester tester(GetProfile());
1656 1656
1657 tester.AddDomain(kOrigin1.host()); 1657 tester.AddDomain(kOrigin1.host());
1658 tester.AddDomain(kOrigin2.host()); 1658 tester.AddDomain(kOrigin2.host());
1659 tester.AddDomain(kOrigin3.host()); 1659 tester.AddDomain(kOrigin3.host());
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
1768 EXPECT_THAT(language_model->GetLanguageFrequency("es"), FloatEq(0.25)); 1768 EXPECT_THAT(language_model->GetLanguageFrequency("es"), FloatEq(0.25));
1769 1769
1770 // Clearing the full history does the trick. 1770 // Clearing the full history does the trick.
1771 BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(), 1771 BlockUntilBrowsingDataRemoved(base::Time(), base::Time::Max(),
1772 BrowsingDataRemover::REMOVE_HISTORY, false); 1772 BrowsingDataRemover::REMOVE_HISTORY, false);
1773 1773
1774 EXPECT_THAT(language_model->GetTopLanguages(), SizeIs(0)); 1774 EXPECT_THAT(language_model->GetTopLanguages(), SizeIs(0));
1775 EXPECT_THAT(language_model->GetLanguageFrequency("en"), FloatEq(0.0)); 1775 EXPECT_THAT(language_model->GetLanguageFrequency("en"), FloatEq(0.0));
1776 EXPECT_THAT(language_model->GetLanguageFrequency("es"), FloatEq(0.0)); 1776 EXPECT_THAT(language_model->GetLanguageFrequency("es"), FloatEq(0.0));
1777 } 1777 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698