Implement permissions embargo for prompts which are repeatedly ignored.

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
 
 #include "base/guid.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 566 matching lines @@
       : autoblocker_(PermissionDecisionAutoBlocker::GetForProfile(profile)) {}
 
   int GetDismissCount(const GURL& url, ContentSettingsType permission) {
     return autoblocker_->GetDismissCount(url, permission);
   }
 
   int GetIgnoreCount(const GURL& url, ContentSettingsType permission) {
     return autoblocker_->GetIgnoreCount(url, permission);
   }
 
-  int RecordIgnore(const GURL& url, ContentSettingsType permission) {
-    return autoblocker_->RecordIgnore(url, permission);
+  bool RecordIgnoreAndEmbargo(const GURL& url, ContentSettingsType permission) {
+    return autoblocker_->RecordIgnoreAndEmbargo(url, permission);
   }
 
   bool RecordDismissAndEmbargo(const GURL& url,
                                ContentSettingsType permission) {
     return autoblocker_->RecordDismissAndEmbargo(url, permission);
   }
 
   void CheckEmbargo(const GURL& url,
                     ContentSettingsType permission,
                     ContentSetting expected_setting) {
@@ skipping 1071 matching lines @@
   filter_builder_1->AddRegisterableDomain(kTestRegisterableDomain1);
 
   std::unique_ptr<BrowsingDataFilterBuilder> filter_builder_2(
       BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST));
   filter_builder_2->AddRegisterableDomain(kTestRegisterableDomain1);
   base::test::ScopedFeatureList feature_list;
   feature_list.InitWithFeatures({features::kBlockPromptsIfDismissedOften}, {});
 
   {
     // Test REMOVE_HISTORY.
-    EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
-                                     CONTENT_SETTINGS_TYPE_GEOLOCATION));
-    EXPECT_EQ(2, tester.RecordIgnore(kOrigin1,
-                                     CONTENT_SETTINGS_TYPE_GEOLOCATION));
-    EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
-                                     CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
+    EXPECT_FALSE(tester.RecordIgnoreAndEmbargo(
+        kOrigin1, CONTENT_SETTINGS_TYPE_GEOLOCATION));
+    EXPECT_FALSE(tester.RecordIgnoreAndEmbargo(
+        kOrigin1, CONTENT_SETTINGS_TYPE_GEOLOCATION));
+    EXPECT_FALSE(tester.RecordIgnoreAndEmbargo(
+        kOrigin1, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
     EXPECT_FALSE(tester.RecordDismissAndEmbargo(
         kOrigin1, CONTENT_SETTINGS_TYPE_MIDI_SYSEX));
-    EXPECT_EQ(1, tester.RecordIgnore(kOrigin2,
-                                     CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
+    EXPECT_FALSE(tester.RecordIgnoreAndEmbargo(
+        kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
     tester.CheckEmbargo(kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
                         CONTENT_SETTING_ASK);
     EXPECT_FALSE(tester.RecordDismissAndEmbargo(
         kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
     EXPECT_FALSE(tester.RecordDismissAndEmbargo(
         kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
     EXPECT_TRUE(tester.RecordDismissAndEmbargo(
         kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
     tester.CheckEmbargo(kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
                         CONTENT_SETTING_BLOCK);
@@ skipping 30 matching lines @@
                                         CONTENT_SETTINGS_TYPE_MIDI_SYSEX));
     EXPECT_EQ(0, tester.GetIgnoreCount(
                      kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
     EXPECT_EQ(0, tester.GetDismissCount(
                      kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
     tester.CheckEmbargo(kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
                         CONTENT_SETTING_ASK);
   }
   {
     // Test REMOVE_SITE_DATA.
-    EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
-                                     CONTENT_SETTINGS_TYPE_GEOLOCATION));
-    EXPECT_EQ(2, tester.RecordIgnore(kOrigin1,
-                                     CONTENT_SETTINGS_TYPE_GEOLOCATION));
-    EXPECT_EQ(1, tester.RecordIgnore(kOrigin1,
-                                     CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
+    EXPECT_FALSE(tester.RecordIgnoreAndEmbargo(
+        kOrigin1, CONTENT_SETTINGS_TYPE_GEOLOCATION));
+    EXPECT_FALSE(tester.RecordIgnoreAndEmbargo(
+        kOrigin1, CONTENT_SETTINGS_TYPE_GEOLOCATION));
+    EXPECT_FALSE(tester.RecordIgnoreAndEmbargo(
+        kOrigin1, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
     EXPECT_FALSE(tester.RecordDismissAndEmbargo(
         kOrigin1, CONTENT_SETTINGS_TYPE_MIDI_SYSEX));
     tester.CheckEmbargo(kOrigin1, CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
                         CONTENT_SETTING_ASK);
-    EXPECT_EQ(1, tester.RecordIgnore(kOrigin2,
-                                     CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
+    EXPECT_FALSE(tester.RecordIgnoreAndEmbargo(
+        kOrigin2, CONTENT_SETTINGS_TYPE_DURABLE_STORAGE));
     EXPECT_FALSE(tester.RecordDismissAndEmbargo(
         kOrigin2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
 
     BlockUntilOriginDataRemoved(
         AnHourAgo(), base::Time::Max(),
         ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_USAGE_DATA,
         std::move(filter_builder_2));
 
     // kOrigin2 should be gone, but kOrigin1 remains.
     EXPECT_EQ(2, tester.GetIgnoreCount(kOrigin1,
@@ skipping 226 matching lines @@
   EXPECT_FALSE(Match(kOrigin1, kProtected, nullptr));
   EXPECT_FALSE(Match(kOriginExt, kProtected, nullptr));
   EXPECT_FALSE(Match(kOriginDevTools, kProtected, nullptr));
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   EXPECT_FALSE(Match(kOrigin1, kExtension, nullptr));
   EXPECT_TRUE(Match(kOriginExt, kExtension, nullptr));
   EXPECT_FALSE(Match(kOriginDevTools, kExtension, nullptr));
 #endif
 }