Permission Action Reporting: Add num_prior_* fields.

chrome/browser/permissions/permission_decision_auto_blocker.cc

 // 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.
 
 #include "chrome/browser/permissions/permission_decision_auto_blocker.h"
 
 #include <memory>
 
 #include "base/feature_list.h"
 #include "base/logging.h"
@@ skipping 69 matching lines @@
     GURL origin(site.primary_pattern.ToString());
 
     if (origin.is_valid() && filter.Run(origin)) {
       map->SetWebsiteSettingDefaultScope(
           origin, GURL(), CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT,
           std::string(), nullptr);
     }
   }
 }
 
+// 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) {
   UpdateFromVariations();
 }
 
 int PermissionDecisionAutoBlocker::RecordIgnore(
     const GURL& url,
     content::PermissionType permission) {
   int current_ignore_count =
@@ skipping 12 matching lines @@
 
   PermissionUmaUtil::PermissionPromptDismissed(permission,
                                                current_dismissal_count);
 
   if (!base::FeatureList::IsEnabled(features::kBlockPromptsIfDismissedOften))
     return false;
 
   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,
     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));
@@ skipping 11 matching lines @@
 
 void PermissionDecisionAutoBlocker::UpdateFromVariations() {
   int prompt_dismissals = -1;
   std::string value = variations::GetVariationParamValueByFeature(
       features::kBlockPromptsIfDismissedOften, kPromptDismissCountKey);
 
   // If converting the value fails, stick with the default value.
   if (base::StringToInt(value, &prompt_dismissals) && prompt_dismissals > 0)
     prompt_dismissals_before_block_ = prompt_dismissals;
 }