Permissions: Clear embargo if user changes an embargoed permission's setting.

chrome/browser/permissions/permission_decision_auto_blocker.h

 // Copyright 2016 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.
 
 #ifndef CHROME_BROWSER_PERMISSIONS_PERMISSION_DECISION_AUTO_BLOCKER_H_
 #define CHROME_BROWSER_PERMISSIONS_PERMISSION_DECISION_AUTO_BLOCKER_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 74 matching lines @@
 
   // Records that a dismissal of a prompt for |permission| was made. If the
   // total number of dismissals exceeds a threshhold and
   // features::kBlockPromptsIfDismissedOften is enabled it will place |url|
   // under embargo for |permission|.
   bool RecordDismissAndEmbargo(const GURL& url, ContentSettingsType permission);
 
   // Records that an ignore of a prompt for |permission| was made.
   int RecordIgnore(const GURL& url, ContentSettingsType permission);
 
+  // Removes the embargo status for the given URL. For permissions embargoed
+  // under repeated dismissals, this means a prompt will be shown to the user on
+  // next permission request. On blacklisted permissions, the next permission
+  // request will re-embargo the permission only if it is still blacklisted.
+  // This method assumes |permission| is known to be under embargo.
+  void RemoveEmbargoByURL(const GURL& url, ContentSettingsType permission);

[dominickn, 2017/04/03 01:35:30]

Nit: call this RemoveEmbargoByUrl.

"Removes the embargo status for |url|."

[Patti Lor, 2017/04/05 08:34:27]

Done.

+
   // Removes any recorded counts for urls which match |filter|.
   void RemoveCountsByUrl(base::Callback<bool(const GURL& url)> filter);
 
  private:
   friend class PermissionContextBaseTests;
   friend class PermissionDecisionAutoBlockerUnitTest;
 
   explicit PermissionDecisionAutoBlocker(Profile* profile);
   ~PermissionDecisionAutoBlocker() override;
 
@@ skipping 24 matching lines @@
   scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> db_manager_;
 
   // Timeout in ms.
   int safe_browsing_timeout_;
 
   std::unique_ptr<base::Clock> clock_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PermissionDecisionAutoBlocker);
 };
 #endif  // CHROME_BROWSER_PERMISSIONS_PERMISSION_DECISION_AUTO_BLOCKER_H_