Reduce usage of base::Callback in chrome/browser/conflicts

This fixes most of the presubmit errors you get when
modifying those files

Bug: 714018
Change-Id: I5581e3264ea172e725a9dae07f3a734d845d92aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1592766
Commit-Queue: Patrick Monette <pmonette@chromium.org>
Reviewed-by: Sébastien Marchand <sebmarchand@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659142}

chrome/browser/conflicts/module_database_win.cc

@@ -80,7 +80,8 @@ void InitPrefChangeRegistrarOnUIThread(
   // only be invoked if it is still alive.
   pref_change_registrar->Add(
       prefs::kThirdPartyBlockingEnabled,
-      base::Bind(&OnThirdPartyBlockingPolicyChanged, pref_change_registrar));
+      base::BindRepeating(&OnThirdPartyBlockingPolicyChanged,
+                          pref_change_registrar));
 }
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
@@ -92,10 +93,10 @@ constexpr base::TimeDelta ModuleDatabase::kIdleTimeout;
 ModuleDatabase::ModuleDatabase(
     std::unique_ptr<service_manager::Connector> connector,
     bool third_party_blocking_policy_enabled)
-    : idle_timer_(
-          FROM_HERE,
-          kIdleTimeout,
-          base::Bind(&ModuleDatabase::OnDelayExpired, base::Unretained(this))),
+    : idle_timer_(FROM_HERE,
+                  kIdleTimeout,
+                  base::BindRepeating(&ModuleDatabase::OnDelayExpired,
+                                      base::Unretained(this))),
       has_started_processing_(false),
       shell_extensions_enumerated_(false),
       ime_enumerated_(false),
@@ -104,8 +105,8 @@ ModuleDatabase::ModuleDatabase(
 #endif
       // ModuleDatabase owns |module_inspector_|, so it is safe to use
       // base::Unretained().
-      module_inspector_(base::Bind(&ModuleDatabase::OnModuleInspected,
-                                   base::Unretained(this)),
+      module_inspector_(base::BindRepeating(&ModuleDatabase::OnModuleInspected,
+                                            base::Unretained(this)),
                         std::move(connector)) {
   AddObserver(&module_inspector_);
   AddObserver(&third_party_metrics_);

chrome/browser/conflicts/module_event_sink_impl_win.h

@@ -26,7 +26,7 @@ class ModuleEventSinkImpl : public mojom::ModuleEventSink {
  public:
   // Callback for retrieving the handle associated with a process. This is used
   // by "Create" to get a handle to the remote process.
-  using GetProcessCallback = base::Callback<base::Process()>;
+  using GetProcessCallback = base::RepeatingCallback<base::Process()>;
 
   using OnModuleLoadCallback =
       base::RepeatingCallback<void(content::ProcessType process_type,

chrome/browser/conflicts/module_inspector_win.h

@@ -59,8 +59,8 @@ class ModuleInspector : public ModuleDatabaseObserver {
       base::TimeDelta::FromMinutes(5);
 
   using OnModuleInspectedCallback =
-      base::Callback<void(const ModuleInfoKey& module_key,
-                          ModuleInspectionResult inspection_result)>;
+      base::RepeatingCallback<void(const ModuleInfoKey& module_key,
+                                   ModuleInspectionResult inspection_result)>;
 
   ModuleInspector(const OnModuleInspectedCallback& on_module_inspected_callback,
                   std::unique_ptr<service_manager::Connector> connector);

chrome/browser/conflicts/module_inspector_win_unittest.cc

@@ -91,8 +91,8 @@ class ModuleInspectorTest : public testing::Test {
 
 TEST_F(ModuleInspectorTest, OneModule) {
   ModuleInspector module_inspector(
-      base::Bind(&ModuleInspectorTest::OnModuleInspected,
-                 base::Unretained(this)),
+      base::BindRepeating(&ModuleInspectorTest::OnModuleInspected,
+                          base::Unretained(this)),
       nullptr);
 
   module_inspector.AddModule({GetKernel32DllFilePath(), 0, 0});
@@ -110,8 +110,8 @@ TEST_F(ModuleInspectorTest, MultipleModules) {
   };
 
   ModuleInspector module_inspector(
-      base::Bind(&ModuleInspectorTest::OnModuleInspected,
-                 base::Unretained(this)),
+      base::BindRepeating(&ModuleInspectorTest::OnModuleInspected,
+                          base::Unretained(this)),
       nullptr);
 
   for (const auto& module : kTestCases)
@@ -133,8 +133,8 @@ TEST_F(ModuleInspectorTest, DisableBackgroundInspection) {
   };
 
   ModuleInspector module_inspector(
-      base::Bind(&ModuleInspectorTest::OnModuleInspected,
-                 base::Unretained(this)),
+      base::BindRepeating(&ModuleInspectorTest::OnModuleInspected,
+                          base::Unretained(this)),
       nullptr);
 
   for (const auto& module : kTestCases)
@@ -168,8 +168,8 @@ TEST_F(ModuleInspectorTest, OOPInspectModule) {
   };
 
   ModuleInspector module_inspector(
-      base::Bind(&ModuleInspectorTest::OnModuleInspected,
-                 base::Unretained(this)),
+      base::BindRepeating(&ModuleInspectorTest::OnModuleInspected,
+                          base::Unretained(this)),
       nullptr);
   module_inspector.SetConnectorForTesting(
       test_connector_factory_.GetDefaultConnector());
@@ -201,8 +201,8 @@ TEST_F(ModuleInspectorTest, InspectionResultsCache) {
       CreateInspectionResultsCacheWithEntry(module_key, inspection_result));
 
   ModuleInspector module_inspector(
-      base::Bind(&ModuleInspectorTest::OnModuleInspected,
-                 base::Unretained(this)),
+      base::BindRepeating(&ModuleInspectorTest::OnModuleInspected,
+                          base::Unretained(this)),
       nullptr);
 
   module_inspector.AddModule(module_key);
@@ -230,8 +230,8 @@ TEST_F(ModuleInspectorTest, InspectionResultsCache_OnModuleDatabaseIdle) {
       chrome::DIR_USER_DATA, scoped_temp_dir.GetPath());
 
   ModuleInspector module_inspector(
-      base::Bind(&ModuleInspectorTest::OnModuleInspected,
-                 base::Unretained(this)),
+      base::BindRepeating(&ModuleInspectorTest::OnModuleInspected,
+                          base::Unretained(this)),
       nullptr);
 
   ModuleInfoKey module_key(GetKernel32DllFilePath(), 0, 0);
@@ -271,8 +271,8 @@ TEST_F(ModuleInspectorTest, InspectionResultsCache_TimerExpired) {
       chrome::DIR_USER_DATA, scoped_temp_dir.GetPath());
 
   ModuleInspector module_inspector(
-      base::Bind(&ModuleInspectorTest::OnModuleInspected,
-                 base::Unretained(this)),
+      base::BindRepeating(&ModuleInspectorTest::OnModuleInspected,
+                          base::Unretained(this)),
       nullptr);
 
   ModuleInfoKey module_key(GetKernel32DllFilePath(), 0, 0);