Fix PRESUBMIT list of base::Bind/Callback exceptions and new violators

The PRESUBMIT.py rule checking for base::Bind and base::Callback usage
was not working, so new usage crept into places that were previously
marked clean.

This CL updates the list in PRESUBMIT.py. A lot of places listed in the
list are now clean or no longer exist. For places that were previously
clean and now violate the rule, we mostly convert them over.

3 exceptions that we add to the PRESUBMIT.py list are:
  //jingle
  //media/blink
  //weblayer

R=sky@chromium.org

Bug: 1028284
Change-Id: I2e34f57879265c4894be1d1c4d132bf17fb973a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1934767
Commit-Queue: danakj <danakj@chromium.org>
Reviewed-by: Erik Staab <estaab@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719249}

PRESUBMIT.py

@@ -252,7 +252,7 @@ _BANNED_IOS_EGTEST_FUNCTIONS = (
 
 # Directories that contain deprecated Bind() or Callback types.
 # Find sub-directories from a given directory by running:
-# for i in `find . -maxdepth 1 -type d`; do
+# for i in `find . -maxdepth 1 -type d|sort`; do
 #   echo "-- $i"
 #   (cd $i; git grep -P 'base::(Bind\(|(Callback<|Closure))'|wc -l)
 # done
@@ -272,7 +272,6 @@ _NOT_CONVERTED_TO_MODERN_BIND_AND_CALLBACK = '|'.join((
   '^chrome/chrome_watcher/',
   '^chrome/common/',
   '^chrome/installer/',
-  '^chrome/notification_helper/',
   '^chrome/renderer/',
   '^chrome/services/',
   '^chrome/test/',
@@ -285,28 +284,20 @@ _NOT_CONVERTED_TO_MODERN_BIND_AND_CALLBACK = '|'.join((
   '^chromecast/metrics/',
   '^chromecast/net/',
   '^chromeos/attestation/',
-  '^chromeos/audio/',
   '^chromeos/components/',
-  '^chromeos/cryptohome/',
   '^chromeos/dbus/',
-  '^chromeos/geolocation/',
   '^chromeos/login/',
   '^chromeos/network/',
-  '^chromeos/process_proxy/',
   '^chromeos/services/',
   '^chromeos/settings/',
-  '^chromeos/timezone/',
-  '^chromeos/tpm/',
   '^components/arc/',
   '^components/assist_ranker/',
   '^components/autofill/',
   '^components/autofill_assistant/',
   '^components/bookmarks/',
-  '^components/browser_sync/',
   '^components/browser_watcher/',
   '^components/browsing_data/',
   '^components/cast_channel/',
-  '^components/certificate_transparency/',
   '^components/chromeos_camera/',
   '^components/component_updater/',
   '^components/content_settings/',
@@ -314,17 +305,15 @@ _NOT_CONVERTED_TO_MODERN_BIND_AND_CALLBACK = '|'.join((
   '^components/cronet/',
   '^components/data_reduction_proxy/',
   '^components/discardable_memory/',
-  '^components/dom_distiller/',
   '^components/domain_reliability/',
+  '^components/dom_distiller/',
   '^components/download/',
   '^components/drive/',
   '^components/exo/',
-  '^components/favicon/',
   '^components/feature_engagement/',
   '^components/feedback/',
   '^components/flags_ui/',
   '^components/gcm_driver/',
-  '^components/google/',
   '^components/guest_view/',
   '^components/heap_profiling/',
   '^components/history/',
@@ -340,11 +329,9 @@ _NOT_CONVERTED_TO_MODERN_BIND_AND_CALLBACK = '|'.join((
   '^components/network_time/',
   '^components/ntp_snippets/',
   '^components/ntp_tiles/',
-  '^components/offline_items_collection/',
   '^components/offline_pages/',
   '^components/omnibox/',
   '^components/ownership/',
-  '^components/pairing/',
   '^components/password_manager/',
   '^components/payments/',
   '^components/plugins/',
@@ -355,7 +342,6 @@ _NOT_CONVERTED_TO_MODERN_BIND_AND_CALLBACK = '|'.join((
   '^components/quirks/',
   '^components/rappor/',
   '^components/remote_cocoa/',
-  '^components/renderer_context_menu/',
   '^components/rlz/',
   '^components/safe_browsing/',
   '^components/search_engines/',
@@ -369,10 +355,7 @@ _NOT_CONVERTED_TO_MODERN_BIND_AND_CALLBACK = '|'.join((
   '^components/storage_monitor/',
   '^components/subresource_filter/',
   '^components/suggestions/',
-  '^components/supervised_user_error_page/',
   '^components/sync/',
-  '^components/sync_bookmarks/',
-  '^components/sync_device_info/',
   '^components/sync_preferences/',
   '^components/sync_sessions/',
   '^components/test/',
@@ -383,24 +366,14 @@ _NOT_CONVERTED_TO_MODERN_BIND_AND_CALLBACK = '|'.join((
   '^components/upload_list/',
   '^components/variations/',
   '^components/visitedlink/',
-  '^components/web_cache/',
   '^components/webcrypto/',
   '^components/webdata/',
   '^components/webdata_services/',
   '^components/wifi/',
-  '^components/zoom/',
   '^content/browser/',
-  '^content/child/',
   '^content/public/',
-  '^content/utility/',
-  '^dbus/',
-  '^device/base/',
   '^device/bluetooth/',
-  '^device/fido/',
-  '^device/gamepad/',
-  '^device/vr/',
   '^extensions/',
-  '^gin/',
   '^google_apis/dive/',
   '^google_apis/gaia/',
   '^google_apis/gcm/',
@@ -411,8 +384,10 @@ _NOT_CONVERTED_TO_MODERN_BIND_AND_CALLBACK = '|'.join((
   '^ios/web/',
   '^ios/web_view/',
   '^ipc/',
+  '^jingle/',
   '^media/audio/',
   '^media/base/',
+  '^media/blink/',
   '^media/capture/',
   '^media/cast/',
   '^media/cdm/',
@@ -426,7 +401,6 @@ _NOT_CONVERTED_TO_MODERN_BIND_AND_CALLBACK = '|'.join((
   '^media/remoting/',
   '^media/renderers/',
   '^media/test/',
-  '^mojo/core/',
   '^mojo/public/',
   '^net/',
   '^ppapi/proxy/',
@@ -442,11 +416,8 @@ _NOT_CONVERTED_TO_MODERN_BIND_AND_CALLBACK = '|'.join((
   '^remoting/protocol/',
   '^remoting/signaling/',
   '^remoting/test/',
-  '^sandbox/linux/',
-  '^sandbox/win/',
   '^services/',
   '^storage/browser/',
-  '^testing/libfuzzer/',
   '^third_party/blink/',
   '^third_party/crashpad/crashpad/test/gtest_main.cc',
   '^third_party/leveldatabase/leveldb_chrome.cc',
@@ -459,17 +430,10 @@ _NOT_CONVERTED_TO_MODERN_BIND_AND_CALLBACK = '|'.join((
   '^tools/clang/base_bind_rewriters/',  # Intentional.
   '^tools/gdb/gdb_chrome.py',  # Intentional.
   '^ui/accelerated_widget_mac/',
-  '^ui/android/',
-  '^ui/aura/',
   '^ui/base/',
   '^ui/compositor/',
   '^ui/display/',
-  '^ui/events/',
-  '^ui/gfx/',
-  '^ui/message_center/',
-  '^ui/snapshot/',
-  '^ui/views_content_client/',
-  '^ui/wm/',
+  '^weblayer/',
 ))
 
 # Format: Sequence of tuples containing:

chrome/common/service_process_util.h

@@ -87,7 +87,7 @@ class ServiceProcessState {
   // |task_runner| must be of type IO and is the loop that POSIX uses
   // to monitor the service process.
   bool SignalReady(scoped_refptr<base::SingleThreadTaskRunner> task_runner,
-                   const base::Closure& terminate_task);
+                   base::OnceClosure terminate_task);
 
   // Signal that the service process is stopped.
   void SignalStopped();

chrome/common/service_process_util_posix.cc

@@ -194,9 +194,8 @@ MultiProcessLock* TakeNamedLock(const std::string& name, bool waiting) {
 }
 
 ServiceProcessTerminateMonitor::ServiceProcessTerminateMonitor(
-    const base::Closure& terminate_task)
-    : terminate_task_(terminate_task) {
-}
+    base::OnceClosure terminate_task)
+    : terminate_task_(std::move(terminate_task)) {}
 
 ServiceProcessTerminateMonitor::~ServiceProcessTerminateMonitor() {
 }
@@ -206,8 +205,7 @@ void ServiceProcessTerminateMonitor::OnFileCanReadWithoutBlocking(int fd) {
     int buffer;
     int length = read(fd, &buffer, sizeof(buffer));
     if ((length == sizeof(buffer)) && (buffer == kTerminateMessage)) {
-      terminate_task_.Run();
-      terminate_task_.Reset();
+      std::move(terminate_task_).Run();
     } else if (length > 0) {
       DLOG(ERROR) << "Unexpected read: " << buffer;
     } else if (length == 0) {
@@ -321,7 +319,7 @@ void ServiceProcessState::CreateState() {
 
 bool ServiceProcessState::SignalReady(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
-    const base::Closure& terminate_task) {
+    base::OnceClosure terminate_task) {
   DCHECK(task_runner);
   DCHECK(state_);
 
@@ -331,8 +329,8 @@ bool ServiceProcessState::SignalReady(
     return false;
   }
 #endif
-  state_->terminate_monitor.reset(
-      new ServiceProcessTerminateMonitor(terminate_task));
+  state_->terminate_monitor = std::make_unique<ServiceProcessTerminateMonitor>(
+      std::move(terminate_task));
   if (pipe(state_->sockets) < 0) {
     DPLOG(ERROR) << "pipe";
     return false;

chrome/common/service_process_util_posix.h

@@ -51,7 +51,7 @@ class ServiceProcessTerminateMonitor
     kTerminateMessage = 0xdecea5e
   };
 
-  explicit ServiceProcessTerminateMonitor(const base::Closure& terminate_task);
+  explicit ServiceProcessTerminateMonitor(base::OnceClosure terminate_task);
   ~ServiceProcessTerminateMonitor() override;
 
   // MessagePumpForIO::FdWatcher overrides
@@ -59,7 +59,7 @@ class ServiceProcessTerminateMonitor
   void OnFileCanWriteWithoutBlocking(int fd) override;
 
  private:
-  base::Closure terminate_task_;
+  base::OnceClosure terminate_task_;
 };
 
 struct ServiceProcessState::StateData {

chrome/common/service_process_util_win.cc

@@ -59,9 +59,8 @@ std::string GetObsoleteServiceProcessAutoRunKey() {
 class ServiceProcessTerminateMonitor
     : public base::win::ObjectWatcher::Delegate {
  public:
-  explicit ServiceProcessTerminateMonitor(const base::Closure& terminate_task)
-      : terminate_task_(terminate_task) {
-  }
+  explicit ServiceProcessTerminateMonitor(base::OnceClosure terminate_task)
+      : terminate_task_(std::move(terminate_task)) {}
   void Start() {
     base::string16 event_name = GetServiceProcessTerminateEventName();
     DCHECK(event_name.length() <= MAX_PATH);
@@ -71,16 +70,14 @@ class ServiceProcessTerminateMonitor
 
   // base::ObjectWatcher::Delegate implementation.
   void OnObjectSignaled(HANDLE object) override {
-    if (!terminate_task_.is_null()) {
-      terminate_task_.Run();
-      terminate_task_.Reset();
-    }
+    if (!terminate_task_.is_null())
+      std::move(terminate_task_).Run();
   }
 
  private:
   base::win::ScopedHandle terminate_event_;
   base::win::ObjectWatcher watcher_;
-  base::Closure terminate_task_;
+  base::OnceClosure terminate_task_;
 };
 
 }  // namespace
@@ -225,15 +222,16 @@ bool ServiceProcessState::TakeSingletonLock() {
 
 bool ServiceProcessState::SignalReady(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
-    const base::Closure& terminate_task) {
+    base::OnceClosure terminate_task) {
   DCHECK(state_);
   DCHECK(state_->ready_event.IsValid());
   if (!SetEvent(state_->ready_event.Get())) {
     return false;
   }
   if (!terminate_task.is_null()) {
-    state_->terminate_monitor.reset(
-        new ServiceProcessTerminateMonitor(terminate_task));
+    state_->terminate_monitor =
+        std::make_unique<ServiceProcessTerminateMonitor>(
+            std::move(terminate_task));
     state_->terminate_monitor->Start();
   }
   return true;

chrome/service/service_ipc_server.cc

@@ -19,8 +19,8 @@ ServiceIPCServer::ServiceIPCServer(
   DCHECK(client);
   DCHECK(shutdown_event);
   binder_registry_.AddInterface(
-      base::Bind(&ServiceIPCServer::HandleServiceProcessConnection,
-                 base::Unretained(this)));
+      base::BindRepeating(&ServiceIPCServer::HandleServiceProcessConnection,
+                          base::Unretained(this)));
 }
 
 bool ServiceIPCServer::Init() {
@@ -34,8 +34,8 @@ void ServiceIPCServer::CreateChannel() {
   receiver_.Bind(
       mojo::PendingReceiver<service_manager::mojom::InterfaceProvider>(
           client_->CreateChannelMessagePipe()));
-  receiver_.set_disconnect_handler(
-      base::Bind(&ServiceIPCServer::OnChannelError, base::Unretained(this)));
+  receiver_.set_disconnect_handler(base::BindOnce(
+      &ServiceIPCServer::OnChannelError, base::Unretained(this)));
 }
 
 ServiceIPCServer::~ServiceIPCServer() = default;

chrome/service/service_ipc_server_unittest.cc

@@ -119,9 +119,8 @@ void ServiceIPCServerTest::TearDown() {
 
 void ServiceIPCServerTest::PumpLoops() {
   base::RunLoop run_loop;
-  io_thread_.task_runner()->PostTaskAndReply(FROM_HERE,
-                                             base::Bind(&PumpCurrentLoop),
-                                             run_loop.QuitClosure());
+  io_thread_.task_runner()->PostTaskAndReply(
+      FROM_HERE, base::BindOnce(&PumpCurrentLoop), run_loop.QuitClosure());
   run_loop.Run();
   PumpCurrentLoop();
 }

chrome/service/service_process.cc

@@ -238,15 +238,15 @@ bool ServiceProcess::Initialize(base::OnceClosure quit_closure,
 
   ipc_server_.reset(new ServiceIPCServer(this /* client */, io_task_runner(),
                                          &shutdown_event_));
-  ipc_server_->binder_registry().AddInterface(
-      base::Bind(&cloud_print::CloudPrintMessageHandler::Create, this));
+  ipc_server_->binder_registry().AddInterface(base::BindRepeating(
+      &cloud_print::CloudPrintMessageHandler::Create, this));
   ipc_server_->Init();
 
   // After the IPC server has started we signal that the service process is
   // ready.
   if (!service_process_state_->SignalReady(
           io_task_runner().get(),
-          base::Bind(&ServiceProcess::Terminate, base::Unretained(this)))) {
+          base::BindOnce(&ServiceProcess::Terminate, base::Unretained(this)))) {
     return false;
   }
 

chrome/service/service_utility_process_host.cc

@@ -438,10 +438,10 @@ void ServiceUtilityProcessHost::OnRenderPDFPagesToMetafilesPageDone(
 
   base::PostTaskAndReplyWithResult(
       client_task_runner_.get(), FROM_HERE,
-      base::Bind(&Client::MetafileAvailable, client_.get(), scale_factor,
-                 base::Passed(&emf_region)),
-      base::Bind(&ServiceUtilityProcessHost::OnMetafileSpooled,
-                 weak_ptr_factory_.GetWeakPtr()));
+      base::BindOnce(&Client::MetafileAvailable, client_.get(), scale_factor,
+                     base::Passed(&emf_region)),
+      base::BindOnce(&ServiceUtilityProcessHost::OnMetafileSpooled,
+                     weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ServiceUtilityProcessHost::OnPDFToEmfFinished(bool success) {

chrome/updater/mac/net/network_unittest.mm

@@ -105,7 +105,7 @@ TEST_F(ChromeUpdaterNetworkMacTest, NetworkFetcherMacPostRequest) {
   auto fetcher = base::MakeRefCounted<NetworkFetcherFactory>()->Create();
 
   net::EmbeddedTestServer test_server;
-  test_server.RegisterRequestHandler(base::Bind(
+  test_server.RegisterRequestHandler(base::BindRepeating(
       &ChromeUpdaterNetworkMacTest::HandleRequest, base::Unretained(this)));
   ASSERT_TRUE(test_server.Start());
   const GURL url = test_server.GetURL("/echo");
@@ -130,7 +130,7 @@ TEST_F(ChromeUpdaterNetworkMacTest, NetworkFetcherMacDownloadToFile) {
   auto fetcher = base::MakeRefCounted<NetworkFetcherFactory>()->Create();
 
   net::EmbeddedTestServer test_server;
-  test_server.RegisterRequestHandler(base::Bind(
+  test_server.RegisterRequestHandler(base::BindRepeating(
       &ChromeUpdaterNetworkMacTest::HandleRequest, base::Unretained(this)));
   ASSERT_TRUE(test_server.Start());
   const GURL url = test_server.GetURL("/echo");

chrome/updater/win/installer/run_all_unittests.cc

@@ -11,5 +11,5 @@ int main(int argc, char** argv) {
 
   return base::LaunchUnitTestsSerially(
       argc, argv,
-      base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
+      base::BindOnce(&base::TestSuite::Run, base::Unretained(&test_suite)));
 }

chromeos/memory/kstaled.cc

@@ -67,7 +67,7 @@ void InitializeKstaled() {
   DCHECK(debugd_client);
 
   debugd_client->SetKstaledRatio(static_cast<uint8_t>(feature_ratio),
-                                 base::Bind(&OnRatioSet));
+                                 base::BindOnce(&OnRatioSet));
 }
 
 }  // namespace chromeos

components/media_message_center/media_controls_progress_view.cc

@@ -127,8 +127,8 @@ void MediaControlsProgressView::UpdateProgress(
         std::abs(1 / media_position.playback_rate()));
     update_progress_timer_.Start(
         FROM_HERE, update_frequency,
-        base::Bind(&MediaControlsProgressView::UpdateProgress,
-                   base::Unretained(this), media_position));
+        base::BindRepeating(&MediaControlsProgressView::UpdateProgress,
+                            base::Unretained(this), media_position));
   }
 }
 

components/page_load_metrics/browser/page_load_metrics_update_dispatcher.cc

@@ -637,8 +637,8 @@ void PageLoadMetricsUpdateDispatcher::MaybeDispatchTimingUpdates(
   if (should_buffer_timing_update_callback) {
     timer_->Start(
         FROM_HERE, base::TimeDelta::FromMilliseconds(kBufferTimerDelayMillis),
-        base::Bind(&PageLoadMetricsUpdateDispatcher::DispatchTimingUpdates,
-                   base::Unretained(this)));
+        base::BindOnce(&PageLoadMetricsUpdateDispatcher::DispatchTimingUpdates,
+                       base::Unretained(this)));
   } else if (!timer_->IsRunning()) {
     DispatchTimingUpdates();
   }

components/page_load_metrics/renderer/page_timing_metrics_sender.cc

@@ -264,9 +264,9 @@ void PageTimingMetricsSender::EnsureSendTimer() {
   // sending metrics as soon as possible.
   int delay_ms =
       have_sent_ipc_ ? buffer_timer_delay_ms_ : kInitialTimerDelayMillis;
-  timer_->Start(
-      FROM_HERE, base::TimeDelta::FromMilliseconds(delay_ms),
-      base::Bind(&PageTimingMetricsSender::SendNow, base::Unretained(this)));
+  timer_->Start(FROM_HERE, base::TimeDelta::FromMilliseconds(delay_ms),
+                base::BindOnce(&PageTimingMetricsSender::SendNow,
+                               base::Unretained(this)));
 }
 
 void PageTimingMetricsSender::SendNow() {

components/performance_manager/graph/graph_operations_unittest.cc

@@ -100,7 +100,7 @@ TEST_F(GraphOperationsTest, VisitFrameTree) {
 
   std::vector<const FrameNode*> visited;
   GraphOperations::VisitFrameTreePreOrder(
-      page1_.get(), base::Bind(
+      page1_.get(), base::BindRepeating(
                         [](std::vector<const FrameNode*>* visited,
                            const FrameNode* frame_node) -> bool {
                           visited->push_back(frame_node);
@@ -116,7 +116,7 @@ TEST_F(GraphOperationsTest, VisitFrameTree) {
 
   visited.clear();
   GraphOperations::VisitFrameTreePostOrder(
-      page1_.get(), base::Bind(
+      page1_.get(), base::BindRepeating(
                         [](std::vector<const FrameNode*>* visited,
                            const FrameNode* frame_node) -> bool {
                           visited->push_back(frame_node);

components/performance_manager/graph/policies/process_priority_policy_unittest.cc

@@ -62,8 +62,8 @@ class ProcessPriorityPolicyTest : public PerformanceManagerTestHarness {
     // It's safe to pass unretained as we clear the callback before being
     // torn down.
     ProcessPriorityPolicy::SetCallbackForTesting(
-        base::Bind(&ProcessPriorityPolicyTest::OnSetPriorityWrapper,
-                   base::Unretained(this)));
+        base::BindRepeating(&ProcessPriorityPolicyTest::OnSetPriorityWrapper,
+                            base::Unretained(this)));
   }
 
   void TearDown() override {
@@ -106,7 +106,7 @@ class ProcessPriorityPolicyTest : public PerformanceManagerTestHarness {
 TEST_F(ProcessPriorityPolicyTest, GraphReflectedToRenderProcessHost) {
   // Create an instance of the process priority policy.
   PerformanceManager::CallOnGraph(
-      FROM_HERE, base::Bind([](Graph* graph) {
+      FROM_HERE, base::BindOnce([](Graph* graph) {
         std::unique_ptr<ProcessPriorityPolicy> policy(
             new ProcessPriorityPolicy());
         graph->PassToGraph(std::move(policy));

components/performance_manager/public/graph/graph_operations.h

@@ -17,7 +17,7 @@ class ProcessNode;
 // A collection of utilities for performing common queries and traversals on a
 // graph.
 struct GraphOperations {
-  using FrameNodeVisitor = base::Callback<bool(const FrameNode*)>;
+  using FrameNodeVisitor = base::RepeatingCallback<bool(const FrameNode*)>;
 
   // Returns the collection of page nodes that are associated with the given
   // |process|. A page is associated with a process if the page's frame tree

components/performance_manager/public/graph/process_node.h

@@ -37,7 +37,7 @@ class RenderProcessHostProxy;
 // it.
 class ProcessNode : public Node {
  public:
-  using FrameNodeVisitor = base::Callback<bool(const FrameNode*)>;
+  using FrameNodeVisitor = base::RepeatingCallback<bool(const FrameNode*)>;
   using Observer = ProcessNodeObserver;
   class ObserverDefaultImpl;
 

fuchsia/engine/browser/content_directory_loader_factory.cc

@@ -428,12 +428,12 @@ void ContentDirectoryLoaderFactory::CreateLoaderAndStart(
   }
 
   // Load the resource on a blocking-capable TaskRunner.
-  task_runner_->PostTask(FROM_HERE,
-                         base::Bind(&ContentDirectoryURLLoader::CreateAndStart,
-                                    base::Passed(std::move(loader)), request,
-                                    base::Passed(std::move(client)),
-                                    base::Passed(std::move(file_handle)),
-                                    base::Passed(std::move(metadata_handle))));
+  task_runner_->PostTask(
+      FROM_HERE, base::BindOnce(&ContentDirectoryURLLoader::CreateAndStart,
+                                base::Passed(std::move(loader)), request,
+                                base::Passed(std::move(client)),
+                                base::Passed(std::move(file_handle)),
+                                base::Passed(std::move(metadata_handle))));
 }
 
 void ContentDirectoryLoaderFactory::Clone(

fuchsia/engine/browser/cookie_manager_impl_unittest.cc

@@ -74,7 +74,7 @@ class CookieManagerImplTest : public testing::Test {
     net::CookieOptions options;
     mojo_cookie_manager_->SetCanonicalCookie(
         *CreateCookie(name, value), "https", options,
-        base::Bind([](net::CanonicalCookie::CookieInclusionStatus status) {
+        base::BindOnce([](net::CanonicalCookie::CookieInclusionStatus status) {
           EXPECT_TRUE(status.IsInclude());
         }));
   }
@@ -85,7 +85,7 @@ class CookieManagerImplTest : public testing::Test {
 
     mojo_cookie_manager_->DeleteCanonicalCookie(
         *CreateCookie(name, value),
-        base::Bind([](bool success) { EXPECT_TRUE(success); }));
+        base::BindOnce([](bool success) { EXPECT_TRUE(success); }));
   }
 
   // Synchronously fetches all cookies via the |cookie_manager_|.

gpu/command_buffer/tests/webgpu_test.cc

@@ -93,7 +93,7 @@ void WebGPUTest::Initialize(const Options& options) {
 
   ASSERT_TRUE(
       webgpu()->RequestAdapterAsync(webgpu::PowerPreference::kDefault,
-                                    base::Bind(&OnRequestAdapterCallback)));
+                                    base::BindOnce(&OnRequestAdapterCallback)));
 
   DawnProcTable procs = webgpu()->GetProcs();
   dawnProcSetProcs(&procs);

ui/color/color_transform.cc

@@ -16,7 +16,7 @@ ColorTransform::ColorTransform(Callback callback)
 ColorTransform::ColorTransform(SkColor color) {
   const auto generator = [](SkColor color, SkColor input_color,
                             const ColorMixer& mixer) { return color; };
-  callback_ = base::Bind(generator, color);
+  callback_ = base::BindRepeating(generator, color);
 }
 
 ColorTransform::ColorTransform(ColorId id) {
@@ -25,7 +25,7 @@ ColorTransform::ColorTransform(ColorId id) {
                             const ColorMixer& mixer) {
     return mixer.GetResultColor(id);
   };
-  callback_ = base::Bind(generator, id);
+  callback_ = base::BindRepeating(generator, id);
 }
 
 ColorTransform::ColorTransform(const ColorTransform&) = default;
@@ -49,8 +49,8 @@ ColorTransform AlphaBlend(ColorTransform foreground_transform,
                                    background_transform.Run(input_color, mixer),
                                    alpha);
   };
-  return base::Bind(generator, std::move(foreground_transform),
-                    std::move(background_transform), alpha);
+  return base::BindRepeating(generator, std::move(foreground_transform),
+                             std::move(background_transform), alpha);
 }
 
 ColorTransform BlendForMinContrast(
@@ -78,10 +78,10 @@ ColorTransform BlendForMinContrast(
                    contrast_ratio)
             .color;
       };
-  return base::Bind(generator, std::move(foreground_transform),
-                    std::move(background_transform),
-                    std::move(high_contrast_foreground_transform),
-                    contrast_ratio);
+  return base::BindRepeating(generator, std::move(foreground_transform),
+                             std::move(background_transform),
+                             std::move(high_contrast_foreground_transform),
+                             contrast_ratio);
 }
 
 ColorTransform BlendForMinContrastWithSelf(ColorTransform transform,
@@ -96,7 +96,7 @@ ColorTransform BlendTowardMaxContrast(ColorTransform transform, SkAlpha alpha) {
     return color_utils::BlendTowardMaxContrast(
         transform.Run(input_color, mixer), alpha);
   };
-  return base::Bind(generator, std::move(transform), alpha);
+  return base::BindRepeating(generator, std::move(transform), alpha);
 }
 
 ColorTransform ContrastInvert(ColorTransform transform) {
@@ -113,7 +113,7 @@ ColorTransform ContrastInvert(ColorTransform transform) {
                                             base::nullopt, contrast_ratio)
         .color;
   };
-  return base::Bind(generator, std::move(transform));
+  return base::BindRepeating(generator, std::move(transform));
 }
 
 ColorTransform DeriveDefaultIconColor(ColorTransform transform) {
@@ -122,7 +122,7 @@ ColorTransform DeriveDefaultIconColor(ColorTransform transform) {
     return color_utils::DeriveDefaultIconColor(
         transform.Run(input_color, mixer));
   };
-  return base::Bind(generator, std::move(transform));
+  return base::BindRepeating(generator, std::move(transform));
 }
 
 ColorTransform FromOriginalColorFromSet(ColorId id, ColorSetId set_id) {
@@ -132,14 +132,14 @@ ColorTransform FromOriginalColorFromSet(ColorId id, ColorSetId set_id) {
                             const ColorMixer& mixer) {
     return mixer.GetOriginalColorFromSet(id, set_id);
   };
-  return base::Bind(generator, id, set_id);
+  return base::BindRepeating(generator, id, set_id);
 }
 
 ColorTransform FromTransformInput() {
   const auto generator = [](SkColor input_color, const ColorMixer& mixer) {
     return input_color;
   };
-  return base::Bind(generator);
+  return base::BindRepeating(generator);
 }
 
 ColorTransform GetColorWithMaxContrast(ColorTransform transform) {
@@ -148,7 +148,7 @@ ColorTransform GetColorWithMaxContrast(ColorTransform transform) {
     return color_utils::GetColorWithMaxContrast(
         transform.Run(input_color, mixer));
   };
-  return base::Bind(generator, std::move(transform));
+  return base::BindRepeating(generator, std::move(transform));
 }
 
 ColorTransform GetResultingPaintColor(ColorTransform foreground_transform,
@@ -160,8 +160,8 @@ ColorTransform GetResultingPaintColor(ColorTransform foreground_transform,
         foreground_transform.Run(input_color, mixer),
         background_transform.Run(input_color, mixer));
   };
-  return base::Bind(generator, std::move(foreground_transform),
-                    std::move(background_transform));
+  return base::BindRepeating(generator, std::move(foreground_transform),
+                             std::move(background_transform));
 }
 
 ColorTransform SelectBasedOnDarkInput(
@@ -178,9 +178,9 @@ ColorTransform SelectBasedOnDarkInput(
                                        : output_transform_for_light_input;
     return output_transform.Run(input_color, mixer);
   };
-  return base::Bind(generator, std::move(input_transform),
-                    std::move(output_transform_for_dark_input),
-                    std::move(output_transform_for_light_input));
+  return base::BindRepeating(generator, std::move(input_transform),
+                             std::move(output_transform_for_dark_input),
+                             std::move(output_transform_for_light_input));
 }
 
 ColorTransform SetAlpha(ColorTransform transform, SkAlpha alpha) {
@@ -188,7 +188,7 @@ ColorTransform SetAlpha(ColorTransform transform, SkAlpha alpha) {
                             SkColor input_color, const ColorMixer& mixer) {
     return SkColorSetA(transform.Run(input_color, mixer), alpha);
   };
-  return base::Bind(generator, std::move(transform), alpha);
+  return base::BindRepeating(generator, std::move(transform), alpha);
 }
 
 }  // namespace ui

ui/gl/direct_composition_surface_win.cc

@@ -708,8 +708,8 @@ void DirectCompositionSurfaceWin::OnVSync(base::TimeTicks vsync_time,
   if (SupportsPresentationFeedback()) {
     task_runner_->PostTask(
         FROM_HERE,
-        base::Bind(&DirectCompositionSurfaceWin::HandleVSyncOnMainThread,
-                   weak_ptr_, vsync_time, interval));
+        base::BindOnce(&DirectCompositionSurfaceWin::HandleVSyncOnMainThread,
+                       weak_ptr_, vsync_time, interval));
   }
 }
 

ui/ozone/platform/wayland/gpu/wayland_buffer_manager_gpu.cc

@@ -43,8 +43,8 @@ void WaylandBufferManagerGpu::OnSubmission(gfx::AcceleratedWidget widget,
   // Return back to the same thread where the commit request came from.
   commit_thread_runner_->PostTask(
       FROM_HERE,
-      base::Bind(&WaylandBufferManagerGpu::SubmitSwapResultOnOriginThread,
-                 base::Unretained(this), widget, buffer_id, swap_result));
+      base::BindOnce(&WaylandBufferManagerGpu::SubmitSwapResultOnOriginThread,
+                     base::Unretained(this), widget, buffer_id, swap_result));
 }
 
 void WaylandBufferManagerGpu::OnPresentation(
@@ -55,8 +55,9 @@ void WaylandBufferManagerGpu::OnPresentation(
   // Return back to the same thread where the commit request came from.
   commit_thread_runner_->PostTask(
       FROM_HERE,
-      base::Bind(&WaylandBufferManagerGpu::SubmitPresentationtOnOriginThread,
-                 base::Unretained(this), widget, buffer_id, feedback));
+      base::BindOnce(
+          &WaylandBufferManagerGpu::SubmitPresentationtOnOriginThread,
+          base::Unretained(this), widget, buffer_id, feedback));
 }
 
 void WaylandBufferManagerGpu::RegisterSurface(gfx::AcceleratedWidget widget,

ui/views/animation/installable_ink_drop.cc

@@ -55,8 +55,8 @@ InstallableInkDrop::InstallableInkDrop(View* view)
       animator_(layer_->size(),
                 &visual_state_,
                 animation_container_.get(),
-                base::Bind(&InstallableInkDrop::SchedulePaint,
-                           base::Unretained(this))) {
+                base::BindRepeating(&InstallableInkDrop::SchedulePaint,
+                                    base::Unretained(this))) {
   // Catch if |view_| is destroyed out from under us.
   if (DCHECK_IS_ON())
     view_->AddObserver(this);

ui/views/animation/installable_ink_drop_animator_unittest.cc

@@ -27,9 +27,9 @@ class InstallableInkDropAnimatorTest : public ::testing::Test {
   InstallableInkDropAnimatorTest()
       : animation_container_(base::MakeRefCounted<gfx::AnimationContainer>()),
         animation_tester_(animation_container_.get()),
-        callback_(
-            base::Bind([](bool* callback_called) { *callback_called = true; },
-                       &callback_called_)) {}
+        callback_(base::BindRepeating(
+            [](bool* callback_called) { *callback_called = true; },
+            &callback_called_)) {}
 
  protected:
   base::test::TaskEnvironment task_environment_;