Make all PermissionDecisionAutoBlocker methods static.

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"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "chrome/common/chrome_features.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/permission_type.h"
 #include "url/gurl.h"
 
 namespace {
 
-// The default number of times that users may explicitly dismiss a permission
-// prompt from an origin before it is automatically blocked.
-const int kPromptDismissalsBeforeBlock = 3;
+// The number of times that users may explicitly dismiss a permission prompt
+// from an origin before it is automatically blocked.
+int g_PromptDismissalsBeforeBlock = 3;

[kcarattini, 2016/10/04 05:26:05]

Aren't globals lowercase with underscores?

[raymes, 2016/10/05 05:02:32]

+1

[dominickn, 2016/10/05 05:55:30]

Done, though we do seem to have a consistency issue in the codebase.

 
 std::unique_ptr<base::DictionaryValue> GetOriginDict(
     HostContentSettingsMap* settings,
     const GURL& origin_url) {
   std::unique_ptr<base::DictionaryValue> dict =
       base::DictionaryValue::From(settings->GetWebsiteSetting(
           origin_url, origin_url,
           CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT, std::string(),
           nullptr));
   if (!dict)
@@ skipping 96 matching lines @@
 }
 
 // static
 int PermissionDecisionAutoBlocker::GetIgnoreCount(
     const GURL& url,
     content::PermissionType permission,
     Profile* profile) {
   return GetActionCount(url, permission, kPromptIgnoreCountKey, profile);
 }
 
-PermissionDecisionAutoBlocker::PermissionDecisionAutoBlocker(Profile* profile)
-    : profile_(profile),
-      prompt_dismissals_before_block_(kPromptDismissalsBeforeBlock) {
-  UpdateFromVariations();
+// static
+int PermissionDecisionAutoBlocker::RecordDismiss(
+    const GURL& url,
+    content::PermissionType permission,
+    Profile* profile) {
+  return RecordActionInWebsiteSettings(url, permission, kPromptDismissCountKey,
+                                       profile);
 }
 
+// static
 int PermissionDecisionAutoBlocker::RecordIgnore(
     const GURL& url,
-    content::PermissionType permission) {
+    content::PermissionType permission,
+    Profile* profile) {
   return RecordActionInWebsiteSettings(url, permission, kPromptIgnoreCountKey,
-                                       profile_);
+                                       profile);
 }
 
+// static
 bool PermissionDecisionAutoBlocker::ShouldChangeDismissalToBlock(
     const GURL& url,
-    content::PermissionType permission) {
-  int current_dismissal_count = RecordActionInWebsiteSettings(
-      url, permission, kPromptDismissCountKey, profile_);
+    content::PermissionType permission,
+    Profile* profile) {
+  int current_dismissal_count = RecordDismiss(url, permission, profile);
 
   if (!base::FeatureList::IsEnabled(features::kBlockPromptsIfDismissedOften))
     return false;
 
-  return current_dismissal_count >= prompt_dismissals_before_block_;
+  return current_dismissal_count >= g_PromptDismissalsBeforeBlock;
 }
 
+// static
 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 converting the value fails, stick with the current value.
   if (base::StringToInt(value, &prompt_dismissals) && prompt_dismissals > 0)
-    prompt_dismissals_before_block_ = prompt_dismissals;
+    g_PromptDismissalsBeforeBlock = prompt_dismissals;
 }