[CodeHealth] Convert components/permissions/ from base::Bind and base::Callback to Once/Repeating

Bug: 1152263
Change-Id: Iea5a9ae4af34b34267f4c4a04b85ea4c3c715b5f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2585640
Commit-Queue: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836571}

components/permissions/permission_decision_auto_blocker.cc

@@ -406,7 +406,7 @@ void PermissionDecisionAutoBlocker::RemoveEmbargoAndResetCounts(
 }
 
 void PermissionDecisionAutoBlocker::RemoveEmbargoAndResetCounts(
-    base::Callback<bool(const GURL& url)> filter) {
+    base::RepeatingCallback<bool(const GURL& url)> filter) {
   std::unique_ptr<ContentSettingsForOneType> settings(
       new ContentSettingsForOneType);
   settings_map_->GetSettingsForOneType(

components/permissions/permission_decision_auto_blocker.h

@@ -113,7 +113,7 @@ class PermissionDecisionAutoBlocker : public KeyedService {
   // Same as above, but cleans the slate for all permissions and for all URLs
   // matching |filter|.
   void RemoveEmbargoAndResetCounts(
-      base::Callback<bool(const GURL& url)> filter);
+      base::RepeatingCallback<bool(const GURL& url)> filter);
 
   static const char* GetPromptDismissCountKeyForTesting();
 

components/permissions/permission_decision_auto_blocker_unittest.cc

@@ -48,12 +48,11 @@ class PermissionDecisionAutoBlockerUnitTest : public testing::Test {
         &browser_context_);
   }
 
-  void SetLastEmbargoStatus(base::Closure quit_closure, bool status) {
+  void SetLastEmbargoStatus(base::OnceClosure quit_closure, bool status) {
     callback_was_run_ = true;
     last_embargoed_status_ = status;
     if (quit_closure) {
-      quit_closure.Run();
-      quit_closure.Reset();
+      std::move(quit_closure).Run();
     }
   }
 
@@ -307,7 +306,8 @@ TEST_F(PermissionDecisionAutoBlockerUnitTest, RemoveEmbargoAndResetCounts_All) {
   EXPECT_EQ(
       2, autoblocker()->GetIgnoreCount(url2, ContentSettingsType::GEOLOCATION));
 
-  autoblocker()->RemoveEmbargoAndResetCounts(base::Bind(&FilterGoogle));
+  autoblocker()->RemoveEmbargoAndResetCounts(
+      base::BindRepeating(&FilterGoogle));
 
   // Expect that url1's actions are gone, but url2's remain.
   EXPECT_EQ(0, autoblocker()->GetDismissCount(
@@ -358,7 +358,7 @@ TEST_F(PermissionDecisionAutoBlockerUnitTest, RemoveEmbargoAndResetCounts_All) {
       1, autoblocker()->GetIgnoreCount(url2, ContentSettingsType::MIDI_SYSEX));
 
   // Remove everything and expect that it's all gone.
-  autoblocker()->RemoveEmbargoAndResetCounts(base::Bind(&FilterAll));
+  autoblocker()->RemoveEmbargoAndResetCounts(base::BindRepeating(&FilterAll));
 
   EXPECT_EQ(0, autoblocker()->GetDismissCount(
                    url1, ContentSettingsType::GEOLOCATION));
@@ -609,7 +609,8 @@ TEST_F(PermissionDecisionAutoBlockerUnitTest, CheckEmbargoStartTime) {
 
   // Remove records of dismiss and ignore embargoes and confirm start time
   // reverts to default.
-  autoblocker()->RemoveEmbargoAndResetCounts(base::Bind(&FilterGoogle));
+  autoblocker()->RemoveEmbargoAndResetCounts(
+      base::BindRepeating(&FilterGoogle));
   embargo_start_time =
       autoblocker()->GetEmbargoStartTime(url, ContentSettingsType::GEOLOCATION);
   EXPECT_EQ(base::Time(), embargo_start_time);

components/permissions/permission_prompt.h

@@ -67,7 +67,7 @@ class PermissionPrompt {
     virtual bool WasCurrentRequestAlreadyDisplayed() = 0;
   };
 
-  typedef base::Callback<
+  typedef base::RepeatingCallback<
       std::unique_ptr<PermissionPrompt>(content::WebContents*, Delegate*)>
       Factory;
 

components/permissions/permission_request_manager.cc

@@ -445,7 +445,7 @@ bool PermissionRequestManager::WasCurrentRequestAlreadyDisplayed() {
 PermissionRequestManager::PermissionRequestManager(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
-      view_factory_(base::Bind(&PermissionPrompt::Create)),
+      view_factory_(base::BindRepeating(&PermissionPrompt::Create)),
       view_(nullptr),
       tab_is_hidden_(web_contents->GetVisibility() ==
                      content::Visibility::HIDDEN),

components/permissions/test/mock_permission_prompt_factory.cc

@@ -20,13 +20,13 @@ MockPermissionPromptFactory::MockPermissionPromptFactory(
       requests_count_(0),
       response_type_(PermissionRequestManager::NONE),
       manager_(manager) {
-  manager->set_view_factory_for_testing(
-      base::Bind(&MockPermissionPromptFactory::Create, base::Unretained(this)));
+  manager->set_view_factory_for_testing(base::BindRepeating(
+      &MockPermissionPromptFactory::Create, base::Unretained(this)));
 }
 
 MockPermissionPromptFactory::~MockPermissionPromptFactory() {
   manager_->set_view_factory_for_testing(
-      base::Bind(&MockPermissionPromptFactory::DoNotCreate));
+      base::BindRepeating(&MockPermissionPromptFactory::DoNotCreate));
   for (auto* prompt : prompts_)
     prompt->factory_ = nullptr;
   prompts_.clear();
@@ -86,7 +86,7 @@ void MockPermissionPromptFactory::WaitForPermissionBubble() {
   base::RunLoop loop;
   show_bubble_quit_closure_ = loop.QuitClosure();
   loop.Run();
-  show_bubble_quit_closure_ = base::Closure();
+  show_bubble_quit_closure_ = base::RepeatingClosure();
 }
 
 // static

components/permissions/test/mock_permission_prompt_factory.h

@@ -81,7 +81,7 @@ class MockPermissionPromptFactory {
   std::vector<MockPermissionPrompt*> prompts_;
   PermissionRequestManager::AutoResponseType response_type_;
 
-  base::Closure show_bubble_quit_closure_;
+  base::RepeatingClosure show_bubble_quit_closure_;
 
   // The bubble manager that will be associated with this factory.
   PermissionRequestManager* manager_;