Convert base::Bind and base::Callback in ash/system to Once/Repeating

Bug: 1007633
Change-Id: I225b0ac97a202041fbe6cd92fa78ae5a1f4d79b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1931621
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Auto-Submit: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718802}

ash/system/bluetooth/bluetooth_power_controller.cc

@@ -93,7 +93,7 @@ void BluetoothPowerController::StartWatchingLocalStatePrefsChanges() {
   local_state_pref_change_registrar_->Init(local_state_);
   local_state_pref_change_registrar_->Add(
       prefs::kSystemBluetoothAdapterEnabled,
-      base::Bind(
+      base::BindRepeating(
           &BluetoothPowerController::OnBluetoothPowerLocalStatePrefChanged,
           base::Unretained(this)));
 }
@@ -245,12 +245,10 @@ void BluetoothPowerController::SetBluetoothPowerOnAdapterReady() {
   pending_bluetooth_power_target_.reset();
   // Always run the next pending task after SetPowered completes regardless
   // the error.
-  bluetooth_adapter_->SetPowered(
-      enabled,
-      base::Bind(&BluetoothPowerController::RunNextPendingBluetoothTask,
-                 weak_ptr_factory_.GetWeakPtr()),
-      base::Bind(&BluetoothPowerController::RunNextPendingBluetoothTask,
-                 weak_ptr_factory_.GetWeakPtr()));
+  auto run_next_task = base::BindRepeating(
+      &BluetoothPowerController::RunNextPendingBluetoothTask,
+      weak_ptr_factory_.GetWeakPtr());
+  bluetooth_adapter_->SetPowered(enabled, run_next_task, run_next_task);
 }
 
 void BluetoothPowerController::RunBluetoothTaskWhenAdapterReady(

ash/system/bluetooth/tray_bluetooth_helper_legacy.cc

@@ -187,10 +187,11 @@ void TrayBluetoothHelperLegacy::StartBluetoothDiscovering() {
   }
   VLOG(1) << "Requesting new Bluetooth device discovery session.";
   should_run_discovery_ = true;
+  // TODO(crbug/1007780): This function should take OnceCallbacks.
   adapter_->StartDiscoverySession(
-      base::Bind(&TrayBluetoothHelperLegacy::OnStartDiscoverySession,
-                 weak_ptr_factory_.GetWeakPtr()),
-      base::Bind(&BluetoothSetDiscoveringError));
+      base::BindRepeating(&TrayBluetoothHelperLegacy::OnStartDiscoverySession,
+                          weak_ptr_factory_.GetWeakPtr()),
+      base::BindRepeating(&BluetoothSetDiscoveringError));
 }
 
 void TrayBluetoothHelperLegacy::StopBluetoothDiscovering() {
@@ -202,8 +203,7 @@ void TrayBluetoothHelperLegacy::StopBluetoothDiscovering() {
     return;
   }
   VLOG(1) << "Stopping Bluetooth device discovery session.";
-  discovery_session_->Stop(base::DoNothing(),
-                           base::Bind(&BluetoothSetDiscoveringError));
+  discovery_session_.reset();
 }
 
 void TrayBluetoothHelperLegacy::ConnectToBluetoothDevice(
@@ -234,19 +234,21 @@ void TrayBluetoothHelperLegacy::ConnectToBluetoothDevice(
       return;
     }
 
+    // TODO(crbug/1007780): This function should take OnceCallbacks.
     device->Connect(nullptr /* pairing_delegate */,
-                    base::Bind(&OnBluetoothDeviceConnect,
-                               true /* was_device_already_paired */),
-                    base::Bind(&OnBluetoothDeviceConnectError,
-                               true /* was_device_already_paired */));
+                    base::BindRepeating(&OnBluetoothDeviceConnect,
+                                        true /* was_device_already_paired */),
+                    base::BindRepeating(&OnBluetoothDeviceConnectError,
+                                        true /* was_device_already_paired */));
     return;
   }
 
   // Simply connect without pairing for devices which do not support pairing.
   if (!device->IsPairable()) {
+    // TODO(crbug/1007780): This function should take OnceCallbacks.
     device->Connect(nullptr /* pairing_delegate */, base::DoNothing(),
-                    base::Bind(&OnBluetoothDeviceConnectError,
-                               false /* was_device_already_paired */));
+                    base::BindRepeating(&OnBluetoothDeviceConnectError,
+                                        false /* was_device_already_paired */));
     return;
   }
 

ash/system/night_light/night_light_controller_impl.cc

@@ -890,10 +890,10 @@ void NightLightControllerImpl::ScheduleNextToggle(base::TimeDelta delay) {
   VLOG(1) << "Setting Night Light to toggle to "
           << (new_status ? "enabled" : "disabled") << " at "
           << base::TimeFormatTimeOfDay(delegate_->GetNow() + delay);
-  timer_.Start(
-      FROM_HERE, delay,
-      base::Bind(&NightLightControllerImpl::SetEnabled, base::Unretained(this),
-                 new_status, AnimationDuration::kLong));
+  timer_.Start(FROM_HERE, delay,
+               base::BindOnce(&NightLightControllerImpl::SetEnabled,
+                              base::Unretained(this), new_status,
+                              AnimationDuration::kLong));
 }
 
 }  // namespace ash

ash/system/power/power_event_observer.cc

@@ -336,7 +336,7 @@ void PowerEventObserver::StopCompositingAndSuspendDisplays() {
   ui::UserActivityDetector::Get()->OnDisplayPowerChanging();
 
   Shell::Get()->display_configurator()->SuspendDisplays(
-      base::Bind(&OnSuspendDisplaysCompleted, block_suspend_token_));
+      base::BindOnce(&OnSuspendDisplaysCompleted, block_suspend_token_));
   block_suspend_token_ = {};
 }
 

ash/system/screen_security/screen_capture_observer.h

@@ -15,9 +15,11 @@ class ScreenCaptureObserver {
   // Called when screen capture is started.
   // |stop_callback| is a callback to stop the stream.
   // |source_callback| is a callback to change the desktop capture source.
+  // These must be base::RepeatingCallbacks so that they can be passed to all
+  // observers.
   virtual void OnScreenCaptureStart(
-      base::RepeatingClosure stop_callback,
-      base::RepeatingClosure source_callback,
+      const base::RepeatingClosure& stop_callback,
+      const base::RepeatingClosure& source_callback,
       const base::string16& screen_capture_status) = 0;
 
   // Called when screen capture is stopped.

ash/system/screen_security/screen_security_notification_controller.cc

@@ -118,11 +118,11 @@ void ScreenSecurityNotificationController::ChangeSource() {
 }
 
 void ScreenSecurityNotificationController::OnScreenCaptureStart(
-    base::RepeatingClosure stop_callback,
-    base::RepeatingClosure source_callback,
+    const base::RepeatingClosure& stop_callback,
+    const base::RepeatingClosure& source_callback,
     const base::string16& screen_capture_status) {
-  capture_stop_callbacks_.emplace_back(std::move(stop_callback));
-  change_source_callback_ = std::move(source_callback);
+  capture_stop_callbacks_.push_back(stop_callback);
+  change_source_callback_ = source_callback;
 
   // We do not want to show the screen capture notification and the chromecast
   // casting tray notification at the same time.
@@ -142,7 +142,7 @@ void ScreenSecurityNotificationController::OnScreenCaptureStop() {
 }
 
 void ScreenSecurityNotificationController::OnScreenShareStart(
-    const base::Closure& stop_callback,
+    const base::RepeatingClosure& stop_callback,
     const base::string16& helper_name) {
   share_stop_callbacks_.emplace_back(std::move(stop_callback));
 

ash/system/screen_security/screen_security_notification_controller.h

@@ -39,13 +39,13 @@ class ASH_EXPORT ScreenSecurityNotificationController
 
   // ScreenCaptureObserver:
   void OnScreenCaptureStart(
-      base::RepeatingClosure stop_callback,
-      base::RepeatingClosure source_callback,
+      const base::RepeatingClosure& stop_callback,
+      const base::RepeatingClosure& source_callback,
       const base::string16& screen_capture_status) override;
   void OnScreenCaptureStop() override;
 
   // ScreenShareObserver:
-  void OnScreenShareStart(const base::Closure& stop_callback,
+  void OnScreenShareStart(const base::RepeatingClosure& stop_callback,
                           const base::string16& helper_name) override;
   void OnScreenShareStop() override;
 

ash/system/screen_security/screen_share_observer.h

@@ -13,7 +13,9 @@ namespace ash {
 class ScreenShareObserver {
  public:
   // Called when screen share is started.
-  virtual void OnScreenShareStart(const base::Closure& stop_callback,
+  // |stop_callback| must be a base::RepeatingCallback so that it can be passed
+  // to all observers.
+  virtual void OnScreenShareStart(const base::RepeatingClosure& stop_callback,
                                   const base::string16& helper_name) = 0;
 
   // Called when screen share is stopped.

ash/system/screen_security/screen_switch_check_controller.cc

@@ -97,8 +97,8 @@ void ScreenSwitchCheckController::CanSwitchAwayFromActiveUser(
 }
 
 void ScreenSwitchCheckController::OnScreenCaptureStart(
-    base::RepeatingClosure stop_callback,
-    base::RepeatingClosure source_callback,
+    const base::RepeatingClosure& stop_callback,
+    const base::RepeatingClosure& source_callback,
     const base::string16& screen_capture_status) {
   has_capture_ = true;
 }
@@ -110,7 +110,7 @@ void ScreenSwitchCheckController::OnScreenCaptureStop() {
 }
 
 void ScreenSwitchCheckController::OnScreenShareStart(
-    const base::Closure& stop_callback,
+    const base::RepeatingClosure& stop_callback,
     const base::string16& helper_name) {
   has_share_ = true;
 }

ash/system/screen_security/screen_switch_check_controller.h

@@ -26,13 +26,13 @@ class ScreenSwitchCheckController : public ScreenCaptureObserver,
  private:
   // ScreenCaptureObserver:
   void OnScreenCaptureStart(
-      base::RepeatingClosure stop_callback,
-      base::RepeatingClosure source_callback,
+      const base::RepeatingClosure& stop_callback,
+      const base::RepeatingClosure& source_callback,
       const base::string16& screen_capture_status) override;
   void OnScreenCaptureStop() override;
 
   // ScreenShareObserver:
-  void OnScreenShareStart(const base::Closure& stop_callback,
+  void OnScreenShareStart(const base::RepeatingClosure& stop_callback,
                           const base::string16& helper_name) override;
   void OnScreenShareStop() override;
 

ash/system/tray/system_tray_notifier.cc

@@ -82,7 +82,7 @@ void SystemTrayNotifier::RemoveScreenShareObserver(
 }
 
 void SystemTrayNotifier::NotifyScreenShareStart(
-    const base::Closure& stop_callback,
+    base::RepeatingClosure stop_callback,
     const base::string16& helper_name) {
   for (auto& observer : screen_share_observers_)
     observer.OnScreenShareStart(stop_callback, helper_name);

ash/system/tray/system_tray_notifier.h

@@ -55,7 +55,7 @@ class ASH_EXPORT SystemTrayNotifier {
   // Screen share.
   void AddScreenShareObserver(ScreenShareObserver* observer);
   void RemoveScreenShareObserver(ScreenShareObserver* observer);
-  void NotifyScreenShareStart(const base::Closure& stop_callback,
+  void NotifyScreenShareStart(base::RepeatingClosure stop_callback,
                               const base::string16& helper_name);
   void NotifyScreenShareStop();