Index: chrome/browser/ui/webui/print_preview/extension_printer_handler.cc |
diff --git a/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc b/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc |
index 9be255d6939facfd5ef1e118ebd7a1a21361336d..d2af8130902c49a1e78ce6474f78908c4f280e50 100644 |
--- a/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc |
+++ b/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc |
@@ -5,6 +5,7 @@ |
#include "chrome/browser/ui/webui/print_preview/extension_printer_handler.h" |
#include <algorithm> |
+#include <utility> |
#include "base/bind.h" |
#include "base/callback.h" |
@@ -62,7 +63,7 @@ scoped_ptr<extensions::PrinterProviderPrintJob> UpdateJobFileInfoOnWorkerThread( |
scoped_ptr<extensions::PrinterProviderPrintJob> job) { |
if (base::GetFileInfo(raster_path, &job->file_info)) |
job->document_path = raster_path; |
- return job.Pass(); |
+ return job; |
} |
// Callback to PWG raster conversion. |
@@ -75,7 +76,7 @@ void UpdateJobFileInfo( |
bool success, |
const base::FilePath& pwg_file_path) { |
if (!success) { |
- callback.Run(job.Pass()); |
+ callback.Run(std::move(job)); |
return; |
} |
@@ -207,7 +208,7 @@ void ExtensionPrinterHandler::StartPrint( |
// the same way as it's done with PWG raster. |
print_job->content_type = kContentTypePdf; |
print_job->document_bytes = print_data; |
- DispatchPrintJob(callback, print_job.Pass()); |
+ DispatchPrintJob(callback, std::move(print_job)); |
return; |
} |
@@ -219,7 +220,7 @@ void ExtensionPrinterHandler::StartPrint( |
print_job->content_type = kContentTypePWGRaster; |
ConvertToPWGRaster(print_data, printer_description, ticket, page_size, |
- print_job.Pass(), |
+ std::move(print_job), |
base::Bind(&ExtensionPrinterHandler::DispatchPrintJob, |
weak_ptr_factory_.GetWeakPtr(), callback)); |
} |
@@ -255,7 +256,7 @@ void ExtensionPrinterHandler::StartGrantPrinterAccess( |
void ExtensionPrinterHandler::SetPwgRasterConverterForTesting( |
scoped_ptr<local_discovery::PWGRasterConverter> pwg_raster_converter) { |
- pwg_raster_converter_ = pwg_raster_converter.Pass(); |
+ pwg_raster_converter_ = std::move(pwg_raster_converter); |
} |
void ExtensionPrinterHandler::ConvertToPWGRaster( |