Permission Action Reporting: Add num_prior_* fields.

chrome/browser/permissions/permission_decision_auto_blocker.cc

Index: chrome/browser/permissions/permission_decision_auto_blocker.cc
diff --git a/chrome/browser/permissions/permission_decision_auto_blocker.cc b/chrome/browser/permissions/permission_decision_auto_blocker.cc
index 12e7170e22ef149eafa9af2888c58d500bd6c523..204dfa0a05adb943f165c315e5bc4b45d978aa60 100644
--- a/chrome/browser/permissions/permission_decision_auto_blocker.cc
+++ b/chrome/browser/permissions/permission_decision_auto_blocker.cc
@@ -87,6 +87,36 @@ void PermissionDecisionAutoBlocker::RemoveCountsByUrl(
   }
 }
 
+// static
+int PermissionDecisionAutoBlocker::GetDismissCount(const GURL& url,
+    content::PermissionType permission, Profile* profile) {
+  return GetActionCount(url, permission, kPromptDismissCountKey, profile);
+}
+
+// static
+int PermissionDecisionAutoBlocker::GetIgnoreCount(const GURL& url,
+    content::PermissionType permission, Profile* profile) {
+  return GetActionCount(url, permission, kPromptIgnoreCountKey, profile);
+}
+
+// static
+int PermissionDecisionAutoBlocker::GetActionCount(

[raymes, 2016/08/17 07:10:53]

nit: I guess we might as well move this into the anonymous namespace above (as a
standalone function) and take it out of the header

[kcarattini, 2016/08/17 07:25:47]

I believe Dom has this covered in a followup cl.

+    const GURL& url,
+    content::PermissionType permission,
+    const char* key,
+    Profile* profile) {
+  HostContentSettingsMap* map =
+      HostContentSettingsMapFactory::GetForProfile(profile);
+  std::unique_ptr<base::DictionaryValue> dict = GetOriginDict(map, url);
+
+  base::DictionaryValue* permission_dict = GetOrCreatePermissionDict(
+      dict.get(), PermissionUtil::GetPermissionString(permission));
+
+  int current_count = 0;
+  permission_dict->GetInteger(key, &current_count);
+  return current_count;
+}
+
 PermissionDecisionAutoBlocker::PermissionDecisionAutoBlocker(Profile* profile)
     : profile_(profile),
       prompt_dismissals_before_block_(kPromptDismissalsBeforeBlock) {
@@ -119,22 +149,6 @@ bool PermissionDecisionAutoBlocker::ShouldChangeDismissalToBlock(
   return current_dismissal_count >= prompt_dismissals_before_block_;
 }
 
-int PermissionDecisionAutoBlocker::GetActionCountForTest(
-    const GURL& url,
-    content::PermissionType permission,
-    const char* key) {
-  HostContentSettingsMap* map =
-      HostContentSettingsMapFactory::GetForProfile(profile_);
-  std::unique_ptr<base::DictionaryValue> dict = GetOriginDict(map, url);
-
-  base::DictionaryValue* permission_dict = GetOrCreatePermissionDict(
-      dict.get(), PermissionUtil::GetPermissionString(permission));
-
-  int current_count = 0;
-  permission_dict->GetInteger(key, &current_count);
-  return current_count;
-}
-
 int PermissionDecisionAutoBlocker::RecordActionInWebsiteSettings(
     const GURL& url,
     content::PermissionType permission,