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

printing/backend/win_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "printing/backend/win_helper.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 377 matching lines @@
   return driver_info;
 }
 
 scoped_ptr<DEVMODE, base::FreeDeleter> XpsTicketToDevMode(
     const base::string16& printer_name,
     const std::string& print_ticket) {
   scoped_ptr<DEVMODE, base::FreeDeleter> dev_mode;
   printing::ScopedXPSInitializer xps_initializer;
   if (!xps_initializer.initialized()) {
     // TODO(sanjeevr): Handle legacy proxy case (with no prntvpt.dll)
-    return dev_mode.Pass();
+    return dev_mode;
   }
 
   printing::ScopedPrinterHandle printer;
   if (!printer.OpenPrinter(printer_name.c_str()))
-    return dev_mode.Pass();
+    return dev_mode;
 
   base::win::ScopedComPtr<IStream> pt_stream;
   HRESULT hr = StreamFromPrintTicket(print_ticket, pt_stream.Receive());
   if (FAILED(hr))
-    return dev_mode.Pass();
+    return dev_mode;
 
   HPTPROVIDER provider = NULL;
   hr = printing::XPSModule::OpenProvider(printer_name, 1, &provider);
   if (SUCCEEDED(hr)) {
     ULONG size = 0;
     DEVMODE* dm = NULL;
     // Use kPTJobScope, because kPTDocumentScope breaks duplex.
     hr = printing::XPSModule::ConvertPrintTicketToDevMode(
         provider, pt_stream.get(), kUserDefaultDevmode, kPTJobScope, &size, &dm,
         NULL);
     if (SUCCEEDED(hr)) {
       // Correct DEVMODE using DocumentProperties. See documentation for
       // PTConvertPrintTicketToDevMode.
       dev_mode = CreateDevMode(printer.Get(), dm);
       printing::XPSModule::ReleaseMemory(dm);
     }
     printing::XPSModule::CloseProvider(provider);
   }
-  return dev_mode.Pass();
+  return dev_mode;
 }
 
 scoped_ptr<DEVMODE, base::FreeDeleter> CreateDevModeWithColor(
     HANDLE printer,
     const base::string16& printer_name,
     bool color) {
   scoped_ptr<DEVMODE, base::FreeDeleter> default_ticket =
       CreateDevMode(printer, NULL);
   if (!default_ticket)
-    return default_ticket.Pass();
+    return default_ticket;
 
   if ((default_ticket->dmFields & DM_COLOR) &&
       ((default_ticket->dmColor == DMCOLOR_COLOR) == color)) {
-    return default_ticket.Pass();
+    return default_ticket;
   }
 
   default_ticket->dmFields |= DM_COLOR;
   default_ticket->dmColor = color ? DMCOLOR_COLOR : DMCOLOR_MONOCHROME;
 
   DriverInfo6 info_6;
   if (!info_6.Init(printer))
-    return default_ticket.Pass();
+    return default_ticket;
 
   const DRIVER_INFO_6* p = info_6.get();
 
   // Only HP known to have issues.
   if (!p->pszMfgName || wcscmp(p->pszMfgName, L"HP") != 0)
-    return default_ticket.Pass();
+    return default_ticket;
 
   // Need XPS for this workaround.
   printing::ScopedXPSInitializer xps_initializer;
   if (!xps_initializer.initialized())
-    return default_ticket.Pass();
+    return default_ticket;
 
   const char* xps_color = color ? kXpsTicketColor : kXpsTicketMonochrome;
   std::string xps_ticket = base::StringPrintf(kXpsTicketTemplate, xps_color);
   scoped_ptr<DEVMODE, base::FreeDeleter> ticket =
       printing::XpsTicketToDevMode(printer_name, xps_ticket);
   if (!ticket)
-    return default_ticket.Pass();
+    return default_ticket;
 
-  return ticket.Pass();
+  return ticket;
 }
 
 scoped_ptr<DEVMODE, base::FreeDeleter> CreateDevMode(HANDLE printer,
                                                      DEVMODE* in) {
   LONG buffer_size = DocumentProperties(
       NULL, printer, const_cast<wchar_t*>(L""), NULL, NULL, 0);
   if (buffer_size < static_cast<int>(sizeof(DEVMODE)))
     return scoped_ptr<DEVMODE, base::FreeDeleter>();
 
   // Some drivers request buffers with size smaller than dmSize + dmDriverExtra.
   // crbug.com/421402
   buffer_size *= 2;
 
   scoped_ptr<DEVMODE, base::FreeDeleter> out(
       reinterpret_cast<DEVMODE*>(calloc(buffer_size, 1)));
   DWORD flags = (in ? (DM_IN_BUFFER) : 0) | DM_OUT_BUFFER;
   if (DocumentProperties(
           NULL, printer, const_cast<wchar_t*>(L""), out.get(), in, flags) !=
       IDOK) {
     return scoped_ptr<DEVMODE, base::FreeDeleter>();
   }
   int size = out->dmSize;
   int extra_size = out->dmDriverExtra;
   CHECK_GE(buffer_size, size + extra_size);
-  return out.Pass();
+  return out;
 }
 
 scoped_ptr<DEVMODE, base::FreeDeleter> PromptDevMode(
     HANDLE printer,
     const base::string16& printer_name,
     DEVMODE* in,
     HWND window,
     bool* canceled) {
   LONG buffer_size =
       DocumentProperties(window,
@@ skipping 18 matching lines @@
                                    out.get(),
                                    in,
                                    flags);
   if (canceled)
     *canceled = (result == IDCANCEL);
   if (result != IDOK)
     return scoped_ptr<DEVMODE, base::FreeDeleter>();
   int size = out->dmSize;
   int extra_size = out->dmDriverExtra;
   CHECK_GE(buffer_size, size + extra_size);
-  return out.Pass();
+  return out;
 }
 
 }  // namespace printing