[Printing] Sort out Once and Repeating callbacks in chrome/browser/ui/webui/print_preview/

Refactor to |base::OnceCallback| where possible.
Explicitly use |base::RepeatingCallback| where it isn't.
Leave as is if depends on API that should be updated.

Bug: 968109
Change-Id: I8b1c3dee4595b03a1f1cf1a285441be3707e83c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1648494Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Vladislav Kuzkokov <vkuzkokov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672073}

chrome/browser/ui/webui/print_preview/cloud_printer_handler.cc

@@ -19,7 +19,7 @@ CloudPrinterHandler::~CloudPrinterHandler() {}
 void CloudPrinterHandler::Reset() {}
 
 void CloudPrinterHandler::StartGetPrinters(
-    const AddedPrintersCallback& added_printers_callback,
+    AddedPrintersCallback added_printers_callback,
     GetPrintersDoneCallback done_callback) {
   // TODO(https://crbug.com/829414): Actually retrieve the printers
   std::move(done_callback).Run();

chrome/browser/ui/webui/print_preview/cloud_printer_handler.h

@@ -22,7 +22,7 @@ class CloudPrinterHandler : public PrinterHandler {
 
   // PrinterHandler implementation:
   void Reset() override;
-  void StartGetPrinters(const AddedPrintersCallback& added_printers_callback,
+  void StartGetPrinters(AddedPrintersCallback added_printers_callback,
                         GetPrintersDoneCallback done_callback) override;
   void StartGetCapability(const std::string& destination_id,
                           GetCapabilityCallback calback) override;

chrome/browser/ui/webui/print_preview/extension_printer_handler.cc

@@ -120,7 +120,7 @@ void ExtensionPrinterHandler::Reset() {
 }
 
 void ExtensionPrinterHandler::StartGetPrinters(
-    const AddedPrintersCallback& callback,
+    AddedPrintersCallback callback,
     GetPrintersDoneCallback done_callback) {
   // Assume that there can only be one printer enumeration occuring at once.
   DCHECK_EQ(pending_enumeration_count_, 0);
@@ -142,13 +142,13 @@ void ExtensionPrinterHandler::StartGetPrinters(
     UsbDeviceManager* usb_manager = UsbDeviceManager::Get(profile_);
     DCHECK(usb_manager);
     usb_manager->GetDevices(
-        base::Bind(&ExtensionPrinterHandler::OnUsbDevicesEnumerated,
-                   weak_ptr_factory_.GetWeakPtr(), callback));
+        base::BindOnce(&ExtensionPrinterHandler::OnUsbDevicesEnumerated,
+                       weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
   GetPrinterProviderAPI(profile_)->DispatchGetPrintersRequested(
       base::BindRepeating(&ExtensionPrinterHandler::WrapGetPrintersCallback,
-                          weak_ptr_factory_.GetWeakPtr(), callback));
+                          weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
 }
 
 void ExtensionPrinterHandler::StartGetCapability(
@@ -280,7 +280,7 @@ void ExtensionPrinterHandler::DispatchPrintJob(
 }
 
 void ExtensionPrinterHandler::WrapGetPrintersCallback(
-    const AddedPrintersCallback& callback,
+    AddedPrintersCallback callback,
     const base::ListValue& printers,
     bool done) {
   DCHECK_GT(pending_enumeration_count_, 0);
@@ -317,7 +317,7 @@ void ExtensionPrinterHandler::WrapGetPrinterInfoCallback(
 }
 
 void ExtensionPrinterHandler::OnUsbDevicesEnumerated(
-    const AddedPrintersCallback& callback,
+    AddedPrintersCallback callback,
     std::vector<device::mojom::UsbDeviceInfoPtr> devices) {
   ExtensionRegistry* registry = ExtensionRegistry::Get(profile_);
   DevicePermissionsManager* permissions_manager =

chrome/browser/ui/webui/print_preview/extension_printer_handler.h

@@ -48,7 +48,7 @@ class ExtensionPrinterHandler : public PrinterHandler {
 
   // PrinterHandler implementation:
   void Reset() override;
-  void StartGetPrinters(const AddedPrintersCallback& added_printers_callback,
+  void StartGetPrinters(AddedPrintersCallback added_printers_callback,
                         GetPrintersDoneCallback done_callback) override;
   void StartGetCapability(const std::string& destination_id,
                           GetCapabilityCallback callback) override;
@@ -83,7 +83,7 @@ class ExtensionPrinterHandler : public PrinterHandler {
   // Methods used as wrappers to callbacks for extensions::PrinterProviderAPI
   // methods, primarily so the callbacks can be bound to this class' weak ptr.
   // They just propagate results to callbacks passed to them.
-  void WrapGetPrintersCallback(const AddedPrintersCallback& callback,
+  void WrapGetPrintersCallback(AddedPrintersCallback callback,
                                const base::ListValue& printers,
                                bool done);
   void WrapGetCapabilityCallback(GetCapabilityCallback callback,
@@ -93,7 +93,7 @@ class ExtensionPrinterHandler : public PrinterHandler {
                                   const base::DictionaryValue& printer_info);
 
   void OnUsbDevicesEnumerated(
-      const AddedPrintersCallback& callback,
+      AddedPrintersCallback callback,
       std::vector<device::mojom::UsbDeviceInfoPtr> devices);
 
   Profile* const profile_;

chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc

@@ -538,8 +538,8 @@ TEST_F(ExtensionPrinterHandlerTest, GetPrinters) {
   bool is_done = false;
 
   extension_printer_handler_->StartGetPrinters(
-      base::Bind(&RecordPrinterList, &call_count, &printers),
-      base::Bind(&RecordPrintersDone, &is_done));
+      base::BindRepeating(&RecordPrinterList, &call_count, &printers),
+      base::BindOnce(&RecordPrintersDone, &is_done));
 
   EXPECT_FALSE(printers.get());
   FakePrinterProviderAPI* fake_api = GetPrinterProviderAPI();
@@ -566,8 +566,8 @@ TEST_F(ExtensionPrinterHandlerTest, GetPrinters_Reset) {
   bool is_done = false;
 
   extension_printer_handler_->StartGetPrinters(
-      base::Bind(&RecordPrinterList, &call_count, &printers),
-      base::Bind(&RecordPrintersDone, &is_done));
+      base::BindRepeating(&RecordPrinterList, &call_count, &printers),
+      base::BindOnce(&RecordPrintersDone, &is_done));
 
   EXPECT_FALSE(printers.get());
   FakePrinterProviderAPI* fake_api = GetPrinterProviderAPI();
@@ -608,8 +608,8 @@ TEST_F(ExtensionPrinterHandlerTest, GetUsbPrinters) {
   std::unique_ptr<base::ListValue> printers;
   bool is_done = false;
   extension_printer_handler_->StartGetPrinters(
-      base::Bind(&RecordPrinterList, &call_count, &printers),
-      base::Bind(&RecordPrintersDone, &is_done));
+      base::BindRepeating(&RecordPrinterList, &call_count, &printers),
+      base::BindOnce(&RecordPrintersDone, &is_done));
 
   base::RunLoop().RunUntilIdle();
 
@@ -656,7 +656,7 @@ TEST_F(ExtensionPrinterHandlerTest, GetCapability) {
   std::unique_ptr<base::DictionaryValue> capability;
 
   extension_printer_handler_->StartGetCapability(
-      kPrinterId, base::Bind(&RecordCapability, &call_count, &capability));
+      kPrinterId, base::BindOnce(&RecordCapability, &call_count, &capability));
 
   EXPECT_EQ(0u, call_count);
 
@@ -683,7 +683,7 @@ TEST_F(ExtensionPrinterHandlerTest, GetCapability_Reset) {
   std::unique_ptr<base::DictionaryValue> capability;
 
   extension_printer_handler_->StartGetCapability(
-      kPrinterId, base::Bind(&RecordCapability, &call_count, &capability));
+      kPrinterId, base::BindOnce(&RecordCapability, &call_count, &capability));
 
   EXPECT_EQ(0u, call_count);
 
@@ -715,7 +715,7 @@ TEST_F(ExtensionPrinterHandlerTest, Print_Pdf) {
 
   extension_printer_handler_->StartPrint(
       title, *base::JSONReader::Read(kPdfSettings), print_data,
-      base::Bind(&RecordPrintResult, &call_count, &success, &status));
+      base::BindOnce(&RecordPrintResult, &call_count, &success, &status));
 
   EXPECT_EQ(0u, call_count);
   FakePrinterProviderAPI* fake_api = GetPrinterProviderAPI();
@@ -751,7 +751,7 @@ TEST_F(ExtensionPrinterHandlerTest, Print_Pdf_Reset) {
 
   extension_printer_handler_->StartPrint(
       title, *base::JSONReader::Read(kPdfSettings), print_data,
-      base::Bind(&RecordPrintResult, &call_count, &success, &status));
+      base::BindOnce(&RecordPrintResult, &call_count, &success, &status));
 
   EXPECT_EQ(0u, call_count);
   FakePrinterProviderAPI* fake_api = GetPrinterProviderAPI();
@@ -776,7 +776,7 @@ TEST_F(ExtensionPrinterHandlerTest, Print_All) {
 
   extension_printer_handler_->StartPrint(
       title, *base::JSONReader::Read(kAllTypesSettings), print_data,
-      base::Bind(&RecordPrintResult, &call_count, &success, &status));
+      base::BindOnce(&RecordPrintResult, &call_count, &success, &status));
 
   EXPECT_EQ(0u, call_count);
 
@@ -813,7 +813,7 @@ TEST_F(ExtensionPrinterHandlerTest, Print_Pwg) {
 
   extension_printer_handler_->StartPrint(
       title, *base::JSONReader::Read(kSimpleRasterSettings), print_data,
-      base::Bind(&RecordPrintResult, &call_count, &success, &status));
+      base::BindOnce(&RecordPrintResult, &call_count, &success, &status));
 
   EXPECT_EQ(0u, call_count);
 
@@ -866,7 +866,7 @@ TEST_F(ExtensionPrinterHandlerTest, Print_Pwg_NonDefaultSettings) {
 
   extension_printer_handler_->StartPrint(
       title, *base::JSONReader::Read(kDuplexSettings), print_data,
-      base::Bind(&RecordPrintResult, &call_count, &success, &status));
+      base::BindOnce(&RecordPrintResult, &call_count, &success, &status));
 
   EXPECT_EQ(0u, call_count);
 
@@ -919,7 +919,7 @@ TEST_F(ExtensionPrinterHandlerTest, Print_Pwg_Reset) {
 
   extension_printer_handler_->StartPrint(
       title, *base::JSONReader::Read(kSimpleRasterSettings), print_data,
-      base::Bind(&RecordPrintResult, &call_count, &success, &status));
+      base::BindOnce(&RecordPrintResult, &call_count, &success, &status));
 
   EXPECT_EQ(0u, call_count);
 
@@ -947,7 +947,7 @@ TEST_F(ExtensionPrinterHandlerTest, Print_Pwg_InvalidTicket) {
 
   extension_printer_handler_->StartPrint(
       title, *base::JSONReader::Read(kInvalidSettings), print_data,
-      base::Bind(&RecordPrintResult, &call_count, &success, &status));
+      base::BindOnce(&RecordPrintResult, &call_count, &success, &status));
 
   EXPECT_EQ(1u, call_count);
 
@@ -968,7 +968,7 @@ TEST_F(ExtensionPrinterHandlerTest, Print_Pwg_FailedConversion) {
 
   extension_printer_handler_->StartPrint(
       title, *base::JSONReader::Read(kSimpleRasterSettings), print_data,
-      base::Bind(&RecordPrintResult, &call_count, &success, &status));
+      base::BindOnce(&RecordPrintResult, &call_count, &success, &status));
 
   EXPECT_EQ(1u, call_count);
 
@@ -987,7 +987,8 @@ TEST_F(ExtensionPrinterHandlerTest, GrantUsbPrinterAccess) {
   std::string printer_id = base::StringPrintf(
       "provisional-usb:fake extension id:%s", device->guid.c_str());
   extension_printer_handler_->StartGrantPrinterAccess(
-      printer_id, base::Bind(&RecordPrinterInfo, &call_count, &printer_info));
+      printer_id,
+      base::BindOnce(&RecordPrinterInfo, &call_count, &printer_info));
 
   EXPECT_FALSE(printer_info.get());
   FakePrinterProviderAPI* fake_api = GetPrinterProviderAPI();
@@ -1019,7 +1020,7 @@ TEST_F(ExtensionPrinterHandlerTest, GrantUsbPrinterAccess_Reset) {
   extension_printer_handler_->StartGrantPrinterAccess(
       base::StringPrintf("provisional-usb:fake extension id:%s",
                          device->guid.c_str()),
-      base::Bind(&RecordPrinterInfo, &call_count, &printer_info));
+      base::BindOnce(&RecordPrinterInfo, &call_count, &printer_info));
 
   EXPECT_FALSE(printer_info.get());
   FakePrinterProviderAPI* fake_api = GetPrinterProviderAPI();

chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos.cc

@@ -152,7 +152,7 @@ void LocalPrinterHandlerChromeos::GetDefaultPrinter(DefaultPrinterCallback cb) {
 }
 
 void LocalPrinterHandlerChromeos::StartGetPrinters(
-    const AddedPrintersCallback& added_printers_callback,
+    AddedPrintersCallback added_printers_callback,
     GetPrintersDoneCallback done_callback) {
   // SyncedPrintersManager is not thread safe and must be called from the UI
   // thread.
@@ -172,7 +172,7 @@ void LocalPrinterHandlerChromeos::StartGetPrinters(
   AddPrintersToList(printers_manager_->GetPrinters(PrinterClass::kAutomatic),
                     &printer_list);
 
-  ConvertPrinterListForCallback(added_printers_callback,
+  ConvertPrinterListForCallback(std::move(added_printers_callback),
                                 std::move(done_callback), printer_list);
 }
 

chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos.h

@@ -42,7 +42,7 @@ class LocalPrinterHandlerChromeos : public PrinterHandler {
   // PrinterHandler implementation
   void Reset() override;
   void GetDefaultPrinter(DefaultPrinterCallback cb) override;
-  void StartGetPrinters(const AddedPrintersCallback& added_printers_callback,
+  void StartGetPrinters(AddedPrintersCallback added_printers_callback,
                         GetPrintersDoneCallback done_callback) override;
   void StartGetCapability(const std::string& printer_name,
                           GetCapabilityCallback cb) override;

chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc

@@ -112,14 +112,14 @@ void LocalPrinterHandlerDefault::GetDefaultPrinter(DefaultPrinterCallback cb) {
 }
 
 void LocalPrinterHandlerDefault::StartGetPrinters(
-    const AddedPrintersCallback& callback,
+    AddedPrintersCallback callback,
     GetPrintersDoneCallback done_callback) {
   VLOG(1) << "Enumerate printers start";
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   base::PostTaskAndReplyWithResult(
       task_runner_.get(), FROM_HERE, base::BindOnce(&EnumeratePrintersAsync),
-      base::BindOnce(&ConvertPrinterListForCallback, callback,
+      base::BindOnce(&ConvertPrinterListForCallback, std::move(callback),
                      std::move(done_callback)));
 }
 

chrome/browser/ui/webui/print_preview/local_printer_handler_default.h

@@ -34,7 +34,7 @@ class LocalPrinterHandlerDefault : public PrinterHandler {
   // PrinterHandler implementation.
   void Reset() override;
   void GetDefaultPrinter(DefaultPrinterCallback cb) override;
-  void StartGetPrinters(const AddedPrintersCallback& added_printers_callback,
+  void StartGetPrinters(AddedPrintersCallback added_printers_callback,
                         GetPrintersDoneCallback done_callback) override;
   void StartGetCapability(const std::string& destination_id,
                           GetCapabilityCallback callback) override;

chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc

@@ -115,13 +115,13 @@ base::Value GetPdfCapabilities(const std::string& locale) {
 // Callback that stores a PDF file on disk.
 void PrintToPdfCallback(scoped_refptr<base::RefCountedMemory> data,
                         const base::FilePath& path,
-                        const base::Closure& pdf_file_saved_closure) {
+                        base::OnceClosure pdf_file_saved_closure) {
   base::File file(path,
                   base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE);
   file.WriteAtCurrentPos(reinterpret_cast<const char*>(data->front()),
                          base::checked_cast<int>(data->size()));
   if (!pdf_file_saved_closure.is_null())
-    pdf_file_saved_closure.Run();
+    std::move(pdf_file_saved_closure).Run();
 }
 
 base::FilePath SelectSaveDirectory(const base::FilePath& path,
@@ -153,7 +153,7 @@ void PdfPrinterHandler::Reset() {
 }
 
 void PdfPrinterHandler::StartGetPrinters(
-    const AddedPrintersCallback& added_printers_callback,
+    AddedPrintersCallback added_printers_callback,
     GetPrintersDoneCallback done_callback) {
   NOTREACHED();
 }
@@ -226,8 +226,8 @@ void PdfPrinterHandler::FileSelectionCanceled(void* params) {
 }
 
 void PdfPrinterHandler::SetPdfSavedClosureForTesting(
-    const base::Closure& closure) {
-  pdf_file_saved_closure_ = closure;
+    base::OnceClosure closure) {
+  pdf_file_saved_closure_ = std::move(closure);
 }
 
 // static
@@ -315,9 +315,9 @@ void PdfPrinterHandler::SelectFile(const base::FilePath& default_filename,
   if (!prompt_user) {
     base::PostTaskWithTraitsAndReplyWithResult(
         FROM_HERE, {base::MayBlock(), base::TaskPriority::BEST_EFFORT},
-        base::Bind(&base::GetUniquePath, path.Append(default_filename)),
-        base::Bind(&PdfPrinterHandler::OnGotUniqueFileName,
-                   weak_ptr_factory_.GetWeakPtr()));
+        base::BindOnce(&base::GetUniquePath, path.Append(default_filename)),
+        base::BindOnce(&PdfPrinterHandler::OnGotUniqueFileName,
+                       weak_ptr_factory_.GetWeakPtr()));
     return;
   }
 
@@ -342,7 +342,7 @@ void PdfPrinterHandler::PostPrintToPdfTask() {
   base::PostTaskWithTraits(
       FROM_HERE, {base::MayBlock(), base::TaskPriority::BEST_EFFORT},
       base::BindOnce(&PrintToPdfCallback, print_data_, print_to_pdf_path_,
-                     pdf_file_saved_closure_));
+                     std::move(pdf_file_saved_closure_)));
   print_to_pdf_path_.clear();
   std::move(print_callback_).Run(base::Value());
 }

chrome/browser/ui/webui/print_preview/pdf_printer_handler.h

@@ -44,7 +44,7 @@ class PdfPrinterHandler : public PrinterHandler,
   // PrinterHandler implementation
   void Reset() override;
   // Required by PrinterHandler implementation but should never be called.
-  void StartGetPrinters(const AddedPrintersCallback& added_printers_callback,
+  void StartGetPrinters(AddedPrintersCallback added_printers_callback,
                         GetPrintersDoneCallback done_callback) override;
   void StartGetCapability(const std::string& destination_id,
                           GetCapabilityCallback callback) override;
@@ -60,7 +60,7 @@ class PdfPrinterHandler : public PrinterHandler,
   void FileSelectionCanceled(void* params) override;
 
   // Sets |pdf_file_saved_closure_| to |closure|.
-  void SetPdfSavedClosureForTesting(const base::Closure& closure);
+  void SetPdfSavedClosureForTesting(base::OnceClosure closure);
 
   // Exposed for testing.
   static base::FilePath GetFileNameForPrintJobTitle(
@@ -99,7 +99,7 @@ class PdfPrinterHandler : public PrinterHandler,
 
   // Notifies tests that want to know if the PDF has been saved. This doesn't
   // notify the test if it was a successful save, only that it was attempted.
-  base::Closure pdf_file_saved_closure_;
+  base::OnceClosure pdf_file_saved_closure_;
 
   // The data to print
   scoped_refptr<base::RefCountedMemory> print_data_;

chrome/browser/ui/webui/print_preview/print_preview_handler.cc

@@ -648,10 +648,10 @@ void PrintPreviewHandler::HandleGetPrinters(const base::ListValue* args) {
   // starts.
   handler->Reset();
   handler->StartGetPrinters(
-      base::Bind(&PrintPreviewHandler::OnAddedPrinters,
-                 weak_factory_.GetWeakPtr(), printer_type),
-      base::Bind(&PrintPreviewHandler::OnGetPrintersDone,
-                 weak_factory_.GetWeakPtr(), callback_id));
+      base::BindRepeating(&PrintPreviewHandler::OnAddedPrinters,
+                          weak_factory_.GetWeakPtr(), printer_type),
+      base::BindOnce(&PrintPreviewHandler::OnGetPrintersDone,
+                     weak_factory_.GetWeakPtr(), callback_id));
 }
 
 void PrintPreviewHandler::HandleGrantExtensionPrinterAccess(
@@ -665,8 +665,8 @@ void PrintPreviewHandler::HandleGrantExtensionPrinterAccess(
   GetPrinterHandler(PrinterType::kExtensionPrinter)
       ->StartGrantPrinterAccess(
           printer_id,
-          base::Bind(&PrintPreviewHandler::OnGotExtensionPrinterInfo,
-                     weak_factory_.GetWeakPtr(), callback_id));
+          base::BindOnce(&PrintPreviewHandler::OnGotExtensionPrinterInfo,
+                         weak_factory_.GetWeakPtr(), callback_id));
 }
 
 void PrintPreviewHandler::HandleGetPrinterCapabilities(
@@ -969,8 +969,9 @@ void PrintPreviewHandler::HandleGetInitialSettings(
   AllowJavascript();
 
   GetPrinterHandler(PrinterType::kLocalPrinter)
-      ->GetDefaultPrinter(base::Bind(&PrintPreviewHandler::SendInitialSettings,
-                                     weak_factory_.GetWeakPtr(), callback_id));
+      ->GetDefaultPrinter(
+          base::BindOnce(&PrintPreviewHandler::SendInitialSettings,
+                         weak_factory_.GetWeakPtr(), callback_id));
 }
 
 void PrintPreviewHandler::GetUserAccountList(base::Value* settings) {
@@ -1392,8 +1393,8 @@ void PrintPreviewHandler::FileSelectedForTesting(const base::FilePath& path,
 }
 
 void PrintPreviewHandler::SetPdfSavedClosureForTesting(
-    const base::Closure& closure) {
-  GetPdfPrinterHandler()->SetPdfSavedClosureForTesting(closure);
+    base::OnceClosure closure) {
+  GetPdfPrinterHandler()->SetPdfSavedClosureForTesting(std::move(closure));
 }
 
 void PrintPreviewHandler::SendEnableManipulateSettingsForTest() {

chrome/browser/ui/webui/print_preview/print_preview_handler.h

@@ -114,7 +114,7 @@ class PrintPreviewHandler : public content::WebUIMessageHandler,
                               void* params);
 
   // Sets |pdf_file_saved_closure_| to |closure|.
-  void SetPdfSavedClosureForTesting(const base::Closure& closure);
+  void SetPdfSavedClosureForTesting(base::OnceClosure closure);
 
   // Fires the 'enable-manipulate-settings-for-test' WebUI event.
   void SendEnableManipulateSettingsForTest();

chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc

@@ -128,7 +128,7 @@ class TestPrinterHandler : public PrinterHandler {
     std::move(cb).Run(default_printer_);
   }
 
-  void StartGetPrinters(const AddedPrintersCallback& added_printers_callback,
+  void StartGetPrinters(AddedPrintersCallback added_printers_callback,
                         GetPrintersDoneCallback done_callback) override {
     if (!printers_.empty())
       added_printers_callback.Run(printers_);

chrome/browser/ui/webui/print_preview/print_preview_ui.cc

@@ -785,9 +785,8 @@ void PrintPreviewUI::SetSelectedFileForTesting(const base::FilePath& path) {
   handler_->FileSelectedForTesting(path, 0, nullptr);
 }
 
-void PrintPreviewUI::SetPdfSavedClosureForTesting(
-    const base::Closure& closure) {
-  handler_->SetPdfSavedClosureForTesting(closure);
+void PrintPreviewUI::SetPdfSavedClosureForTesting(base::OnceClosure closure) {
+  handler_->SetPdfSavedClosureForTesting(std::move(closure));
 }
 
 void PrintPreviewUI::SendEnableManipulateSettingsForTest() {

chrome/browser/ui/webui/print_preview/print_preview_ui.h

@@ -202,7 +202,7 @@ class PrintPreviewUI : public ConstrainedWebDialogUI {
   void SetSelectedFileForTesting(const base::FilePath& path);
 
   // Passes |closure| to PrintPreviewHandler::SetPdfSavedClosureForTesting().
-  void SetPdfSavedClosureForTesting(const base::Closure& closure);
+  void SetPdfSavedClosureForTesting(base::OnceClosure closure);
 
   // Tell the handler to send the enable-manipulate-settings-for-test WebUI
   // event.

chrome/browser/ui/webui/print_preview/print_preview_utils.cc

@@ -165,7 +165,7 @@ base::Value ValidateCddForPrintPreview(base::Value cdd) {
 }
 
 void ConvertPrinterListForCallback(
-    const PrinterHandler::AddedPrintersCallback& callback,
+    PrinterHandler::AddedPrintersCallback callback,
     PrinterHandler::GetPrintersDoneCallback done_callback,
     const PrinterList& printer_list) {
   base::ListValue printers;

chrome/browser/ui/webui/print_preview/print_preview_utils.h

@@ -30,7 +30,7 @@ extern const char kVendorCapabilityKey[];
 // Converts |printer_list| to a base::ListValue form, runs |callback| with the
 // converted list as the argument if it is not empty, and runs |done_callback|.
 void ConvertPrinterListForCallback(
-    const PrinterHandler::AddedPrintersCallback& callback,
+    PrinterHandler::AddedPrintersCallback callback,
     PrinterHandler::GetPrintersDoneCallback done_callback,
     const PrinterList& printer_list);
 

chrome/browser/ui/webui/print_preview/printer_handler.h

@@ -88,9 +88,8 @@ class PrinterHandler {
   // are found. May be called multiple times, or never if there are no printers
   // to add.
   // |done_callback| must be called exactly once when the search is complete.
-  virtual void StartGetPrinters(
-      const AddedPrintersCallback& added_printers_callback,
-      GetPrintersDoneCallback done_callback) = 0;
+  virtual void StartGetPrinters(AddedPrintersCallback added_printers_callback,
+                                GetPrintersDoneCallback done_callback) = 0;
 
   // Starts getting printing capability of the printer with the provided
   // destination ID.

chrome/browser/ui/webui/print_preview/privet_printer_handler.cc

@@ -54,7 +54,7 @@ void PrivetPrinterHandler::Reset() {
 }
 
 void PrivetPrinterHandler::StartGetPrinters(
-    const AddedPrintersCallback& added_printers_callback,
+    AddedPrintersCallback added_printers_callback,
     GetPrintersDoneCallback done_callback) {
   using local_discovery::ServiceDiscoverySharedClient;
   scoped_refptr<ServiceDiscoverySharedClient> service_discovery =
@@ -71,8 +71,8 @@ void PrivetPrinterHandler::StartGetCapability(const std::string& destination_id,
   DCHECK(!capabilities_callback_);
   capabilities_callback_ = std::move(callback);
   CreateHTTP(destination_id,
-             base::Bind(&PrivetPrinterHandler::CapabilitiesUpdateClient,
-                        weak_ptr_factory_.GetWeakPtr()));
+             base::BindOnce(&PrivetPrinterHandler::CapabilitiesUpdateClient,
+                            weak_ptr_factory_.GetWeakPtr()));
 }
 
 void PrivetPrinterHandler::StartPrint(
@@ -163,8 +163,8 @@ void PrivetPrinterHandler::CapabilitiesUpdateClient(
 
   privet_capabilities_operation_ =
       privet_http_client_->CreateCapabilitiesOperation(
-          base::Bind(&PrivetPrinterHandler::OnGotCapabilities,
-                     weak_ptr_factory_.GetWeakPtr()));
+          base::BindOnce(&PrivetPrinterHandler::OnGotCapabilities,
+                         weak_ptr_factory_.GetWeakPtr()));
   privet_capabilities_operation_->Start();
 }
 

chrome/browser/ui/webui/print_preview/privet_printer_handler.h

@@ -40,7 +40,7 @@ class PrivetPrinterHandler
 
   // PrinterHandler implementation:
   void Reset() override;
-  void StartGetPrinters(const AddedPrintersCallback& added_printers_callback,
+  void StartGetPrinters(AddedPrintersCallback added_printers_callback,
                         GetPrintersDoneCallback done_callback) override;
   void StartGetCapability(const std::string& destination_id,
                           GetCapabilityCallback calback) override;