Include driver infor into PrinterBasicInfo.

chrome/service/cloud_print/print_system_win.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 "chrome/service/cloud_print/print_system.h"
 
 #include <objidl.h>
 #include <winspool.h>
 #include <xpsprint.h>
 
@@ skipping 210 matching lines @@
       }
     }
     watcher_.StartWatching(printer_change_, this);
   }
 
   bool GetCurrentPrinterInfo(printing::PrinterBasicInfo* printer_info) {
     DCHECK(printer_info);
     if (!printer_.IsValid())
       return false;
 
-    DWORD bytes_needed = 0;
-    bool ret = false;
-    GetPrinter(printer_, 2, NULL, 0, &bytes_needed);
-    if (0 != bytes_needed) {
-      scoped_array<BYTE> printer_info_buffer(new BYTE[bytes_needed]);
-      if (GetPrinter(printer_, 2, printer_info_buffer.get(),
-                     bytes_needed, &bytes_needed)) {
-        PRINTER_INFO_2* printer_info_win =
-            reinterpret_cast<PRINTER_INFO_2*>(printer_info_buffer.get());
-        printer_info->printer_name = WideToUTF8(printer_info_win->pPrinterName);
-        if (printer_info_win->pComment)
-          printer_info->printer_description =
-              WideToUTF8(printer_info_win->pComment);
-        if (printer_info_win->pLocation)
-          printer_info->options[kLocationTagName] =
-              WideToUTF8(printer_info_win->pLocation);
-        if (printer_info_win->pDriverName)
-          printer_info->options[kDriverNameTagName] =
-              WideToUTF8(printer_info_win->pDriverName);
-        printer_info->printer_status = printer_info_win->Status;
-        ret = true;
-      }
-    }
-    return ret;
+    scoped_array<BYTE> printer_info_buffer;
+    const PRINTER_INFO_2* printer_info_2 =
+        GetPrinterInfo2(printer_, &printer_info_buffer);
+    if (!printer_info_2)
+      return false;
+
+    scoped_array<BYTE> driver_info_buffer;
+    InitBasicPrinterInfo(printer_info_2,
+                         GetDriverInfo6(printer_, &driver_info_buffer),
+                         printer_info);
+    return true;
   }
 
  private:
   base::win::ObjectWatcher watcher_;
   printing::ScopedPrinterHandle printer_;  // The printer being watched
   // Returned by FindFirstPrinterChangeNotifier.
   ScopedPrinterChangeHandle printer_change_;
   Delegate* delegate_;           // Delegate to notify
   bool did_signal_;              // DoneWaiting was called
   std::string printer_info_;     // For crash reporting.
@@ skipping 650 matching lines @@
   RpcStringFree(reinterpret_cast<RPC_WSTR *>(&proxy_id_as_string));
   return ret;
 }
 
 scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
     const base::DictionaryValue* print_system_settings) {
   return new PrintSystemWin;
 }
 
 }  // namespace cloud_print