Merge 237541 "Revert of https://codereview.chromium.org/71013004/"

printing/backend/win_helper.h

 // 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.
 
 #ifndef PRINTING_BACKEND_WIN_HELPER_H_
 #define PRINTING_BACKEND_WIN_HELPER_H_
 
 #include <objidl.h>
 #include <winspool.h>
 #include <prntvpt.h>
@@ skipping 28 matching lines @@
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(PrinterHandleTraits);
 };
 
 class ScopedPrinterHandle
     : public base::win::GenericScopedHandle<PrinterHandleTraits,
                                             base::win::VerifierTraits> {
  public:
   bool OpenPrinter(const wchar_t* printer) {
-    HANDLE temp_handle;
     // ::OpenPrinter may return error but assign some value into handle.
-    if (::OpenPrinter(const_cast<LPTSTR>(printer), &temp_handle, NULL)) {
-      Set(temp_handle);
+    if (!::OpenPrinter(const_cast<LPTSTR>(printer), Receive(), NULL)) {
+      Take();
     }
     return IsValid();
   }
 
  private:
   typedef base::win::GenericScopedHandle<PrinterHandleTraits,
                                          base::win::VerifierTraits> Base;
+  // Hide Receive to avoid assigning handle when ::OpenPrinter returned error.
+  Base::Receiver Receive() {
+    return Base::Receive();
+  }
 };
 
 class PrinterChangeHandleTraits {
  public:
   typedef HANDLE Handle;
 
   static bool CloseHandle(HANDLE handle) {
     ::FindClosePrinterChangeNotification(handle);
     return true;
   }
@@ skipping 95 matching lines @@
 };
 
 PRINTING_EXPORT bool InitBasicPrinterInfo(HANDLE printer,
                                           PrinterBasicInfo* printer_info);
 
 PRINTING_EXPORT std::string GetDriverInfo(HANDLE printer);
 
 }  // namespace printing
 
 #endif  // PRINTING_BACKEND_WIN_HELPER_H_