Clean up DeviceInfoQueryWin.

device/usb/usb_service_impl.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 "device/usb/usb_service_impl.h"
 
 #include <stdint.h>
 
 #include <list>
 #include <memory>
@@ skipping 10 matching lines @@
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "components/device_event_log/device_event_log.h"
 #include "device/usb/usb_device_handle.h"
 #include "device/usb/usb_error.h"
 #include "device/usb/webusb_descriptors.h"
 #include "net/base/io_buffer.h"
 #include "third_party/libusb/src/libusb/libusb.h"
 
 #if defined(OS_WIN)
+#define INITGUID
+#include <devpkey.h>
 #include <setupapi.h>
 #include <usbiodef.h>
 
 #include "base/strings/string_util.h"
 #include "device/base/device_info_query_win.h"
 #endif  // OS_WIN
 
 using net::IOBufferWithSize;
 
 namespace device {
 
 namespace {
 
 // Standard USB requests and descriptor types:
 const uint16_t kUsbVersion2_1 = 0x0210;
 
 #if defined(OS_WIN)
 
 bool IsWinUsbInterface(const std::string& device_path) {
   DeviceInfoQueryWin device_info_query;
   if (!device_info_query.device_info_list_valid()) {
     USB_PLOG(ERROR) << "Failed to create a device information set";
     return false;
   }
 
   // This will add the device so we can query driver info.
-  if (!device_info_query.AddDevice(device_path.c_str())) {
+  if (!device_info_query.AddDevice(device_path)) {
     USB_PLOG(ERROR) << "Failed to get device interface data for "
                     << device_path;
     return false;
   }
 
   if (!device_info_query.GetDeviceInfo()) {
     USB_PLOG(ERROR) << "Failed to get device info for " << device_path;
     return false;
   }
 
   std::string buffer;
-  if (!device_info_query.GetDeviceStringProperty(SPDRP_SERVICE, &buffer)) {
+  if (!device_info_query.GetDeviceStringProperty(DEVPKEY_Device_Service,
+                                                 &buffer)) {
     USB_PLOG(ERROR) << "Failed to get device service property";
     return false;
   }
 
   USB_LOG(DEBUG) << "Driver for " << device_path << " is " << buffer << ".";
   if (base::StartsWith(buffer, "WinUSB", base::CompareCase::INSENSITIVE_ASCII))
     return true;
   return false;
 }
 
@@ skipping 468 matching lines @@
 }
 
 void UsbServiceImpl::EnumerationFailed(PlatformUsbDevice platform_device,
                                        const base::Closure& refresh_complete) {
   libusb_ref_device(platform_device);
   ignored_devices_.insert(platform_device);
   refresh_complete.Run();
 }
 
 }  // namespace device