Remove implicit HANDLE conversions from printing.

BUG=416722
R=scottbyer@chromium.org

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

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

6 files changed, 25 insertions, 25 deletions

diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc
index d56ee60..6c6bd69 100644
--- a/printing/backend/print_backend_win.cc
+++ b/printing/backend/print_backend_win.cc
@@ -197,7 +197,7 @@ bool PrintBackendWin::EnumeratePrinters(PrinterList* printer_list) {
     ScopedPrinterHandle printer;
     PrinterBasicInfo info;
     if (printer.OpenPrinter(printer_info[index].pPrinterName) &&
-        InitBasicPrinterInfo(printer, &info)) {
+        InitBasicPrinterInfo(printer.Get(), &info)) {
       info.is_default = (info.printer_name == default_printer);
       printer_list->push_back(info);
     }
@@ -223,7 +223,7 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults(
   }
 
   PrinterInfo5 info_5;
-  if (!info_5.Init(printer_handle))
+  if (!info_5.Init(printer_handle.Get()))
     return false;
   const wchar_t* name = info_5.get()->pPrinterName;
   const wchar_t* port = info_5.get()->pPortName;
@@ -232,7 +232,7 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults(
   PrinterSemanticCapsAndDefaults caps;
 
   scoped_ptr<DEVMODE, base::FreeDeleter> user_settings =
-      CreateDevMode(printer_handle, NULL);
+      CreateDevMode(printer_handle.Get(), NULL);
   if (user_settings) {
     if (user_settings->dmFields & DM_COLOR)
       caps.color_default = (user_settings->dmColor == DMCOLOR_COLOR);
@@ -322,7 +322,7 @@ bool PrintBackendWin::GetPrinterCapsAndDefaults(
     ScopedPrinterHandle printer_handle;
     if (printer_handle.OpenPrinter(printer_name_wide.c_str())) {
       scoped_ptr<DEVMODE, base::FreeDeleter> devmode_out(
-          CreateDevMode(printer_handle, NULL));
+          CreateDevMode(printer_handle.Get(), NULL));
       if (!devmode_out)
         return false;
       base::win::ScopedComPtr<IStream> printer_defaults_stream;
@@ -354,7 +354,7 @@ std::string PrintBackendWin::GetPrinterDriverInfo(
   if (!printer.OpenPrinter(base::UTF8ToWide(printer_name).c_str())) {
     return std::string();
   }
-  return GetDriverInfo(printer);
+  return GetDriverInfo(printer.Get());
 }
 
 bool PrintBackendWin::IsValidPrinter(const std::string& printer_name) {
diff --git a/printing/backend/win_helper.cc b/printing/backend/win_helper.cc
index db8d735..bb6b69e 100644
--- a/printing/backend/win_helper.cc
+++ b/printing/backend/win_helper.cc
@@ -420,7 +420,7 @@ scoped_ptr<DEVMODE, base::FreeDeleter> XpsTicketToDevMode(
     if (SUCCEEDED(hr)) {
       // Correct DEVMODE using DocumentProperties. See documentation for
       // PTConvertPrintTicketToDevMode.
-      dev_mode = CreateDevMode(printer, dm);
+      dev_mode = CreateDevMode(printer.Get(), dm);
       printing::XPSModule::ReleaseMemory(dm);
     }
     printing::XPSModule::CloseProvider(provider);
diff --git a/printing/emf_win.cc b/printing/emf_win.cc
index f042b29..e959911 100644
--- a/printing/emf_win.cc
+++ b/printing/emf_win.cc
@@ -95,33 +95,33 @@ class RasterBitmap {
   explicit RasterBitmap(const gfx::Size& raster_size)
       : saved_object_(NULL) {
     context_.Set(::CreateCompatibleDC(NULL));
-    if (!context_) {
+    if (!context_.IsValid()) {
       NOTREACHED() << "Bitmap DC creation failed";
       return;
     }
-    ::SetGraphicsMode(context_, GM_ADVANCED);
+    ::SetGraphicsMode(context_.Get(), GM_ADVANCED);
     void* bits = NULL;
     gfx::Rect bitmap_rect(raster_size);
     gfx::CreateBitmapHeader(raster_size.width(), raster_size.height(),
                             &header_.bmiHeader);
-    bitmap_.Set(::CreateDIBSection(context_, &header_, DIB_RGB_COLORS, &bits,
-                                   NULL, 0));
+    bitmap_.Set(::CreateDIBSection(context_.Get(), &header_, DIB_RGB_COLORS,
+                                   &bits, NULL, 0));
     if (!bitmap_)
       NOTREACHED() << "Raster bitmap creation for printing failed";
 
-    saved_object_ = ::SelectObject(context_, bitmap_);
+    saved_object_ = ::SelectObject(context_.Get(), bitmap_);
     RECT rect = bitmap_rect.ToRECT();
-    ::FillRect(context_, &rect,
+    ::FillRect(context_.Get(), &rect,
                static_cast<HBRUSH>(::GetStockObject(WHITE_BRUSH)));
 
   }
 
   ~RasterBitmap() {
-    ::SelectObject(context_, saved_object_);
+    ::SelectObject(context_.Get(), saved_object_);
   }
 
   HDC context() const {
-    return context_;
+    return context_.Get();
   }
 
   base::win::ScopedCreateDC context_;
diff --git a/printing/image_win.cc b/printing/image_win.cc
index fdf99c8..501c0b8 100644
--- a/printing/image_win.cc
+++ b/printing/image_win.cc
@@ -68,14 +68,14 @@ bool Image::LoadMetafile(const Metafile& metafile) {
   gfx::CreateBitmapV4Header(rect.width(), rect.height(), &hdr);
   unsigned char* bits = NULL;
   base::win::ScopedBitmap bitmap(
-      ::CreateDIBSection(hdc, reinterpret_cast<BITMAPINFO*>(&hdr), 0,
+      ::CreateDIBSection(hdc.Get(), reinterpret_cast<BITMAPINFO*>(&hdr), 0,
                          reinterpret_cast<void**>(&bits), NULL, 0));
   DCHECK(bitmap);
-  base::win::ScopedSelectObject select_object(hdc, bitmap);
+  base::win::ScopedSelectObject select_object(hdc.Get(), bitmap);
 
-  skia::InitializeDC(hdc);
+  skia::InitializeDC(hdc.Get());
 
-  bool success = metafile.Playback(hdc, NULL);
+  bool success = metafile.Playback(hdc.Get(), NULL);
 
   row_length_ = size_.width() * sizeof(uint32);
   size_t bytes = row_length_ * size_.height();
diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc
index 42ebb1a..100eb25 100644
--- a/printing/printing_context_win.cc
+++ b/printing/printing_context_win.cc
@@ -59,7 +59,7 @@ PrintingContext::Result PrintingContextWin::UseDefaultSettings() {
     ScopedPrinterHandle printer;
     if (printer.OpenPrinter(default_printer.c_str())) {
       scoped_ptr<DEVMODE, base::FreeDeleter> dev_mode =
-          CreateDevMode(printer, NULL);
+          CreateDevMode(printer.Get(), NULL);
       if (InitializeSettings(default_printer, dev_mode.get()) == OK)
         return OK;
     }
@@ -89,7 +89,7 @@ PrintingContext::Result PrintingContextWin::UseDefaultSettings() {
         if (!printer.OpenPrinter(info_2->pPrinterName))
           continue;
         scoped_ptr<DEVMODE, base::FreeDeleter> dev_mode =
-            CreateDevMode(printer, NULL);
+            CreateDevMode(printer.Get(), NULL);
         if (InitializeSettings(info_2->pPrinterName, dev_mode.get()) == OK)
           return OK;
       }
@@ -144,7 +144,7 @@ PrintingContext::Result PrintingContextWin::UpdatePrinterSettings(
   // Make printer changes local to Chrome.
   // See MSDN documentation regarding DocumentProperties.
   scoped_ptr<DEVMODE, base::FreeDeleter> scoped_dev_mode =
-      CreateDevModeWithColor(printer, settings_.device_name(),
+      CreateDevModeWithColor(printer.Get(), settings_.device_name(),
                              settings_.color() != GRAY);
   if (!scoped_dev_mode)
     return OnError();
@@ -199,9 +199,9 @@ PrintingContext::Result PrintingContextWin::UpdatePrinterSettings(
   // Update data using DocumentProperties.
   if (show_system_dialog) {
     scoped_dev_mode = ShowPrintDialog(
-        printer, delegate_->GetParentView(), scoped_dev_mode.get());
+        printer.Get(), delegate_->GetParentView(), scoped_dev_mode.get());
   } else {
-    scoped_dev_mode = CreateDevMode(printer, scoped_dev_mode.get());
+    scoped_dev_mode = CreateDevMode(printer.Get(), scoped_dev_mode.get());
   }
   // Set printer then refresh printer settings.
   return InitializeSettings(settings_.device_name(), scoped_dev_mode.get());
@@ -219,7 +219,7 @@ PrintingContext::Result PrintingContextWin::InitWithSettings(
     return FAILED;
 
   scoped_ptr<DEVMODE, base::FreeDeleter> dev_mode =
-      CreateDevMode(printer, NULL);
+      CreateDevMode(printer.Get(), NULL);
 
   return InitializeSettings(settings_.device_name(), dev_mode.get());
 }
diff --git a/printing/printing_context_win_unittest.cc b/printing/printing_context_win_unittest.cc
index eb6de5ca..7f6b66b 100644
--- a/printing/printing_context_win_unittest.cc
+++ b/printing/printing_context_win_unittest.cc
@@ -66,7 +66,7 @@ class MockPrintingContextWin : public PrintingContextSytemDialogWin {
     lppd->hDevNames = NULL;
 
     PrinterInfo2 info_2;
-    if (info_2.Init(printer)) {
+    if (info_2.Init(printer.Get())) {
       dev_mode = info_2.get()->pDevMode;
     }
     if (!dev_mode) {