scoped_ptr<DEVMODE[]> replaced with scoped_ptr<DEVMODE, base::FreeDeleter>.

chrome/service/cloud_print/cdd_conversion_win.cc

 // Copyright 2014 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 "chrome/service/cloud_print/cdd_conversion_win.h"
 
 #include "components/cloud_devices/printer_description.h"
 #include "printing/backend/print_backend.h"
 #include "printing/backend/win_helper.h"
 
 namespace cloud_print {
 
 bool IsValidCjt(const std::string& print_ticket_data) {
   cloud_devices::CloudDeviceDescription description;
   return description.InitFromString(print_ticket_data);
 }
 
-scoped_ptr<DEVMODE[]> CjtToDevMode(const base::string16& printer_name,
-                                   const std::string& print_ticket) {
-  using namespace cloud_devices::printer;
+scoped_ptr<DEVMODE, base::FreeDeleter> CjtToDevMode(
+    const base::string16& printer_name,
+    const std::string& print_ticket) {
+  scoped_ptr<DEVMODE, base::FreeDeleter> dev_mode;
+
   cloud_devices::CloudDeviceDescription description;
   if (!description.InitFromString(print_ticket))
-    return scoped_ptr<DEVMODE[]>();
+    return dev_mode.Pass();
 
+  using namespace cloud_devices::printer;
   printing::ScopedPrinterHandle printer;
   if (!printer.OpenPrinter(printer_name.c_str()))
-    return scoped_ptr<DEVMODE[]>();
+    return dev_mode.Pass();
 
-  scoped_ptr<DEVMODE[]> scoped_dev_mode;
   {
     ColorTicketItem color;
     if (color.LoadFrom(description)) {
       bool is_color = color.value().type == STANDARD_COLOR;
-      scoped_dev_mode = CreateDevModeWithColor(printer, printer_name, is_color);
+      dev_mode = CreateDevModeWithColor(printer, printer_name, is_color);
     } else {
-      scoped_dev_mode = printing::CreateDevMode(printer, NULL);
+      dev_mode = printing::CreateDevMode(printer, NULL);
     }
   }
 
-  if (!scoped_dev_mode)
-    return scoped_ptr<DEVMODE[]>();
-
-  DEVMODE* dev_mode = scoped_dev_mode.get();
+  if (!dev_mode)
+    return dev_mode.Pass();
 
   ColorTicketItem color;
   DuplexTicketItem duplex;
   OrientationTicketItem orientation;
   MarginsTicketItem margins;
   DpiTicketItem dpi;
   FitToPageTicketItem fit_to_page;
   MediaTicketItem media;
   CopiesTicketItem copies;
   PageRangeTicketItem page_range;
@@ skipping 61 matching lines @@
     if (width > 0) {
       dev_mode->dmFields |= DM_PAPERWIDTH;
       dev_mode->dmPaperWidth = width;
     }
     if (height > 0) {
       dev_mode->dmFields |= DM_PAPERLENGTH;
       dev_mode->dmPaperLength = height;
     }
   }
 
-  return printing::CreateDevMode(printer, dev_mode);
+  return printing::CreateDevMode(printer, dev_mode.get());
 }
 
 std::string CapabilitiesToCdd(
     const printing::PrinterSemanticCapsAndDefaults& semantic_info) {
   using namespace cloud_devices::printer;
   cloud_devices::CloudDeviceDescription description;
 
   ContentTypesCapability content_types;
   content_types.AddOption("application/pdf");
   content_types.SaveTo(&description);
@@ skipping 90 matching lines @@
   OrientationCapability orientation;
   orientation.AddDefaultOption(PORTRAIT, true);
   orientation.AddOption(LANDSCAPE);
   orientation.AddOption(AUTO_ORIENTATION);
   orientation.SaveTo(&description);
 
   return description.ToString();
 }
 
 }  // namespace cloud_print