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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)
Patch Set: rebase + include content_settings_types.h more 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover_impl_unittest.cc ('k') | chrome/browser/chromeos/attestation/platform_verification_flow.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
index 26ddb051aed6170bd63640aeeb046360ad009d96..64a954affe8c56129de076da59fe31e0228b266f 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
@@ -558,20 +558,20 @@ class RemovePermissionPromptCountsTest {
explicit RemovePermissionPromptCountsTest(TestingProfile* profile)
: autoblocker_(PermissionDecisionAutoBlocker::GetForProfile(profile)) {}
- int GetDismissCount(const GURL& url, content::PermissionType permission) {
+ int GetDismissCount(const GURL& url, ContentSettingsType permission) {
return autoblocker_->GetDismissCount(url, permission);
}
- int GetIgnoreCount(const GURL& url, content::PermissionType permission) {
+ int GetIgnoreCount(const GURL& url, ContentSettingsType permission) {
return autoblocker_->GetIgnoreCount(url, permission);
}
- int RecordIgnore(const GURL& url, content::PermissionType permission) {
+ int RecordIgnore(const GURL& url, ContentSettingsType permission) {
return autoblocker_->RecordIgnore(url, permission);
}
bool ShouldChangeDismissalToBlock(const GURL& url,
- content::PermissionType permission) {
+ ContentSettingsType permission) {
return autoblocker_->RecordDismissAndEmbargo(url, permission);
}
@@ -1575,17 +1575,17 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ClearPermissionPromptCounts) {
{
// Test REMOVE_HISTORY.
EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
- content::PermissionType::GEOLOCATION));
+ CONTENT_SETTINGS_TYPE_GEOLOCATION));
EXPECT_EQ(2, tester.RecordIgnore(kOrigin1,
- content::PermissionType::GEOLOCATION));
+ CONTENT_SETTINGS_TYPE_GEOLOCATION));
EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
- content::PermissionType::NOTIFICATIONS));
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
tester.ShouldChangeDismissalToBlock(kOrigin1,
- content::PermissionType::MIDI_SYSEX);
+ CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
EXPECT_EQ(1, tester.RecordIgnore(kOrigin2,
- content::PermissionType::DURABLE_STORAGE));
+ CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
tester.ShouldChangeDismissalToBlock(kOrigin2,
- content::PermissionType::NOTIFICATIONS);
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
@@ -1593,45 +1593,45 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ClearPermissionPromptCounts) {
// kOrigin1 should be gone, but kOrigin2 remains.
EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
- content::PermissionType::GEOLOCATION));
+ CONTENT_SETTINGS_TYPE_GEOLOCATION));
EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
- content::PermissionType::NOTIFICATIONS));
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
EXPECT_EQ(0, tester.GetDismissCount(kOrigin1,
- content::PermissionType::MIDI_SYSEX));
+ CONTENT_SETTINGS_TYPE_MIDI_SYSEX));
EXPECT_EQ(1, tester.GetIgnoreCount(
- kOrigin2, content::PermissionType::DURABLE_STORAGE));
+ kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
EXPECT_EQ(1, tester.GetDismissCount(
- kOrigin2, content::PermissionType::NOTIFICATIONS));
+ kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_HISTORY, false);
// Everything should be gone.
EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
- content::PermissionType::GEOLOCATION));
+ CONTENT_SETTINGS_TYPE_GEOLOCATION));
EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
- content::PermissionType::NOTIFICATIONS));
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
EXPECT_EQ(0, tester.GetDismissCount(kOrigin1,
- content::PermissionType::MIDI_SYSEX));
+ CONTENT_SETTINGS_TYPE_MIDI_SYSEX));
EXPECT_EQ(0, tester.GetIgnoreCount(
- kOrigin2, content::PermissionType::DURABLE_STORAGE));
+ kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
EXPECT_EQ(0, tester.GetDismissCount(
- kOrigin2, content::PermissionType::NOTIFICATIONS));
+ kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
}
{
// Test REMOVE_SITE_DATA.
EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
- content::PermissionType::GEOLOCATION));
+ CONTENT_SETTINGS_TYPE_GEOLOCATION));
EXPECT_EQ(2, tester.RecordIgnore(kOrigin1,
- content::PermissionType::GEOLOCATION));
+ CONTENT_SETTINGS_TYPE_GEOLOCATION));
EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
- content::PermissionType::NOTIFICATIONS));
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
tester.ShouldChangeDismissalToBlock(kOrigin1,
- content::PermissionType::MIDI_SYSEX);
+ CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
EXPECT_EQ(1, tester.RecordIgnore(kOrigin2,
- content::PermissionType::DURABLE_STORAGE));
+ CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
tester.ShouldChangeDismissalToBlock(kOrigin2,
- content::PermissionType::NOTIFICATIONS);
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
BlockUntilOriginDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
@@ -1639,15 +1639,15 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ClearPermissionPromptCounts) {
// kOrigin2 should be gone, but kOrigin1 remains.
EXPECT_EQ(2, tester.GetIgnoreCount(kOrigin1,
- content::PermissionType::GEOLOCATION));
+ CONTENT_SETTINGS_TYPE_GEOLOCATION));
EXPECT_EQ(1, tester.GetIgnoreCount(kOrigin1,
- content::PermissionType::NOTIFICATIONS));
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
EXPECT_EQ(1, tester.GetDismissCount(kOrigin1,
- content::PermissionType::MIDI_SYSEX));
+ CONTENT_SETTINGS_TYPE_MIDI_SYSEX));
EXPECT_EQ(0, tester.GetIgnoreCount(
- kOrigin2, content::PermissionType::DURABLE_STORAGE));
+ kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
EXPECT_EQ(0, tester.GetDismissCount(
- kOrigin2, content::PermissionType::NOTIFICATIONS));
+ kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
BlockUntilBrowsingDataRemoved(AnHourAgo(), base::Time::Max(),
BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
@@ -1655,15 +1655,15 @@ TEST_F(ChromeBrowsingDataRemoverDelegateTest, ClearPermissionPromptCounts) {
// Everything should be gone.
EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
- content::PermissionType::GEOLOCATION));
+ CONTENT_SETTINGS_TYPE_GEOLOCATION));
EXPECT_EQ(0, tester.GetIgnoreCount(kOrigin1,
- content::PermissionType::NOTIFICATIONS));
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
EXPECT_EQ(0, tester.GetDismissCount(kOrigin1,
- content::PermissionType::MIDI_SYSEX));
+ CONTENT_SETTINGS_TYPE_MIDI_SYSEX));
EXPECT_EQ(0, tester.GetIgnoreCount(
- kOrigin2, content::PermissionType::DURABLE_STORAGE));
+ kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
EXPECT_EQ(0, tester.GetDismissCount(
- kOrigin2, content::PermissionType::NOTIFICATIONS));
+ kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
}
}
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover_impl_unittest.cc ('k') | chrome/browser/chromeos/attestation/platform_verification_flow.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698