Convert Pass()→std::move() on Windows

Also cleaned up a few stragglers from grepping the source: it's unclear
if these are just building with weird defines, don't build at all, only
build on obscure platforms, or something else… either way, Pass()
itself will be removed shortly after this.

BUG=557422

Review URL: https://codereview.chromium.org/1752233002

Cr-Commit-Position: refs/heads/master@{#378872}

2 files changed, 8 insertions, 7 deletions

diff --git a/chrome/service/cloud_print/cdd_conversion_win.cc b/chrome/service/cloud_print/cdd_conversion_win.cc
index 24ed3cb..480b74b 100644
--- a/chrome/service/cloud_print/cdd_conversion_win.cc
+++ b/chrome/service/cloud_print/cdd_conversion_win.cc
@@ -24,12 +24,12 @@ scoped_ptr<DEVMODE, base::FreeDeleter> CjtToDevMode(
 
   cloud_devices::CloudDeviceDescription description;
   if (!description.InitFromString(print_ticket))
-    return dev_mode.Pass();
+    return dev_mode;
 
   using namespace cloud_devices::printer;
   printing::ScopedPrinterHandle printer;
   if (!printer.OpenPrinter(printer_name.c_str()))
-    return dev_mode.Pass();
+    return dev_mode;
 
   {
     ColorTicketItem color;
@@ -43,7 +43,7 @@ scoped_ptr<DEVMODE, base::FreeDeleter> CjtToDevMode(
   }
 
   if (!dev_mode)
-    return dev_mode.Pass();
+    return dev_mode;
 
   ColorTicketItem color;
   DuplexTicketItem duplex;
diff --git a/chrome/service/service_utility_process_host.cc b/chrome/service/service_utility_process_host.cc
index 15748c4..ee38b9b 100644
--- a/chrome/service/service_utility_process_host.cc
+++ b/chrome/service/service_utility_process_host.cc
@@ -7,6 +7,7 @@
 #include <stdint.h>
 
 #include <queue>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ -94,7 +95,7 @@ class ServiceUtilityProcessHost::PdfToEmfState {
     if (!temp_dir_.CreateUniqueTempDir())
       return false;
     return host_->Send(new ChromeUtilityMsg_RenderPDFPagesToMetafiles(
-        IPC::TakeFileHandleForProcess(pdf_file.Pass(), host_->handle()),
+        IPC::TakeFileHandleForProcess(std::move(pdf_file), host_->handle()),
         conversion_settings));
   }
 
@@ -126,9 +127,9 @@ class ServiceUtilityProcessHost::PdfToEmfState {
     DCHECK(!emf_files_.empty());
     base::File file;
     if (!emf_files_.empty())
-      file = emf_files_.front().Pass();
+      file = std::move(emf_files_.front());
     emf_files_.pop();
-    return file.Pass();
+    return file;
   }
 
   void set_page_count(int page_count) { page_count_ = page_count; }
@@ -187,7 +188,7 @@ bool ServiceUtilityProcessHost::StartRenderPDFPagesToMetafile(
   waiting_for_reply_ = true;
 
   pdf_to_emf_state_.reset(new PdfToEmfState(this));
-  return pdf_to_emf_state_->Start(pdf_file.Pass(), render_settings);
+  return pdf_to_emf_state_->Start(std::move(pdf_file), render_settings);
 }
 
 bool ServiceUtilityProcessHost::StartGetPrinterCapsAndDefaults(