Convert PromoteCallback to RepeatingCallback

Bug: 1152282
Change-Id: I44525d812f6493e64c6bd2ef1f95093e73827ee3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2600387Reviewed-by: John Lee <johntlee@chromium.org>
Commit-Queue: Ella Ge <eirage@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839501}

chrome/browser/ui/webui/help/test_version_updater.cc

@@ -9,7 +9,7 @@ TestVersionUpdater::TestVersionUpdater() = default;
 TestVersionUpdater::~TestVersionUpdater() = default;
 
 void TestVersionUpdater::CheckForUpdate(StatusCallback callback,
-                                        const PromoteCallback&) {
+                                        PromoteCallback) {
   callback.Run(status_, progress_, rollback_, powerwash_, version_,
                update_size_, message_);
 }

chrome/browser/ui/webui/help/test_version_updater.h

@@ -19,7 +19,7 @@ class TestVersionUpdater : public VersionUpdater {
   TestVersionUpdater();
   ~TestVersionUpdater() override;
 
-  void CheckForUpdate(StatusCallback callback, const PromoteCallback&) override;
+  void CheckForUpdate(StatusCallback callback, PromoteCallback) override;
 
   void SetReturnedStatus(Status status) { status_ = status; }
 

chrome/browser/ui/webui/help/version_updater.h

@@ -75,7 +75,7 @@ class VersionUpdater {
       StatusCallback;
 
   // Used to show or hide the promote UI elements. Mac-only.
-  typedef base::Callback<void(PromotionState)> PromoteCallback;
+  typedef base::RepeatingCallback<void(PromotionState)> PromoteCallback;
 
   virtual ~VersionUpdater() {}
 
@@ -90,7 +90,7 @@ class VersionUpdater {
   // (which is only used on the Mac) can be used to show or hide the promote UI
   // elements.
   virtual void CheckForUpdate(StatusCallback status_callback,
-                              const PromoteCallback& promote_callback) = 0;
+                              PromoteCallback promote_callback) = 0;
 
 #if defined(OS_MAC)
   // Make updates available for all users.

chrome/browser/ui/webui/help/version_updater_basic.cc

@@ -8,7 +8,7 @@
 #include "chrome/browser/upgrade_detector/upgrade_detector.h"
 
 void VersionUpdaterBasic::CheckForUpdate(StatusCallback status_callback,
-                                         const PromoteCallback&) {
+                                         PromoteCallback) {
   const Status status = UpgradeDetector::GetInstance()->notify_upgrade()
                             ? NEARLY_UPDATED
                             : DISABLED;

chrome/browser/ui/webui/help/version_updater_basic.h

@@ -13,7 +13,7 @@
 class VersionUpdaterBasic : public VersionUpdater {
  public:
   // VersionUpdater implementation.
-  void CheckForUpdate(StatusCallback callback, const PromoteCallback&) override;
+  void CheckForUpdate(StatusCallback callback, PromoteCallback) override;
 
  protected:
   friend class VersionUpdater;

chrome/browser/ui/webui/help/version_updater_chromeos.cc

@@ -153,7 +153,7 @@ void VersionUpdaterCros::GetUpdateStatus(StatusCallback callback) {
 }
 
 void VersionUpdaterCros::CheckForUpdate(StatusCallback callback,
-                                        const PromoteCallback&) {
+                                        PromoteCallback) {
   callback_ = std::move(callback);
 
   // User is actively checking for updates.

chrome/browser/ui/webui/help/version_updater_chromeos.h

@@ -19,7 +19,7 @@ class VersionUpdaterCros : public VersionUpdater,
                            public chromeos::UpdateEngineClient::Observer {
  public:
   // VersionUpdater implementation.
-  void CheckForUpdate(StatusCallback callback, const PromoteCallback&) override;
+  void CheckForUpdate(StatusCallback callback, PromoteCallback) override;
   void SetChannel(const std::string& channel,
                   bool is_powerwash_allowed) override;
   void GetChannel(bool get_current_channel, ChannelCallback callback) override;

chrome/browser/ui/webui/help/version_updater_mac.h

@@ -28,7 +28,7 @@ class VersionUpdaterMac : public VersionUpdater {
  public:
   // VersionUpdater implementation.
   void CheckForUpdate(StatusCallback status_callback,
-                      const PromoteCallback& promote_callback) override;
+                      PromoteCallback promote_callback) override;
   void PromoteUpdater() const override;
 
   // Process status updates received from Keystone. The dictionary will contain

chrome/browser/ui/webui/help/version_updater_mac.mm

@@ -135,9 +135,8 @@ VersionUpdaterMac::VersionUpdaterMac()
 
 VersionUpdaterMac::~VersionUpdaterMac() {}
 
-void VersionUpdaterMac::CheckForUpdate(
-    StatusCallback status_callback,
-    const PromoteCallback& promote_callback) {
+void VersionUpdaterMac::CheckForUpdate(StatusCallback status_callback,
+                                       PromoteCallback promote_callback) {
 #if BUILDFLAG(ENABLE_CHROMIUM_UPDATER)
   if (!update_client_)
     update_client_ = BrowserUpdaterClient::Create();
@@ -147,7 +146,7 @@ void VersionUpdaterMac::CheckForUpdate(
   return;
 #else
   status_callback_ = std::move(status_callback);
-  promote_callback_ = promote_callback;
+  promote_callback_ = std::move(promote_callback);
 
   KeystoneGlue* keystone_glue = [KeystoneGlue defaultKeystoneGlue];
   if (keystone_glue && ![keystone_glue isOnReadOnlyFilesystem]) {

chrome/browser/ui/webui/help/version_updater_win.cc

@@ -27,7 +27,7 @@ VersionUpdaterWin::~VersionUpdaterWin() {
 }
 
 void VersionUpdaterWin::CheckForUpdate(StatusCallback callback,
-                                       const PromoteCallback&) {
+                                       PromoteCallback) {
   // There is no supported integration with Google Update for Chromium.
   callback_ = std::move(callback);
 

chrome/browser/ui/webui/help/version_updater_win.h

@@ -25,7 +25,7 @@ class VersionUpdaterWin : public VersionUpdater,
   ~VersionUpdaterWin() override;
 
   // VersionUpdater:
-  void CheckForUpdate(StatusCallback callback, const PromoteCallback&) override;
+  void CheckForUpdate(StatusCallback callback, PromoteCallback) override;
 
   // UpdateCheckDelegate:
   void OnUpdateCheckComplete(const base::string16& new_version) override;

chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc

@@ -99,8 +99,7 @@ class TestDestructionVersionUpdater : public TestVersionUpdater {
  public:
   ~TestDestructionVersionUpdater() override { destructor_invoked_ = true; }
 
-  void CheckForUpdate(StatusCallback callback,
-                      const PromoteCallback&) override {}
+  void CheckForUpdate(StatusCallback callback, PromoteCallback) override {}
 
   static bool GetDestructorInvoked() { return destructor_invoked_; }