Clean up DeviceInfoQueryWin.

device/base/device_info_query_win.h

Index: device/base/device_info_query_win.h
diff --git a/device/base/device_info_query_win.h b/device/base/device_info_query_win.h
index 17ee13bcb69da6c85295161317854339b6e387eb..f9f464a5030255e7f25b1e175b63c93f05db2319 100644
--- a/device/base/device_info_query_win.h
+++ b/device/base/device_info_query_win.h
@@ -25,12 +25,13 @@ class DEVICE_BASE_EXPORT DeviceInfoQueryWin {
 
   // Add a device to |device_info_list_| using its |device_path| so that
   // its device info can be retrieved.
-  bool AddDevice(const char* device_path);
+  bool AddDevice(const std::string& device_path);
   // Get the device info and store it into |device_info_data_|, this function
   // should be called at most once.
   bool GetDeviceInfo();
   // Get device string property and store it into |property_buffer|.
-  bool GetDeviceStringProperty(DWORD property, std::string* property_buffer);
+  bool GetDeviceStringProperty(const DEVPROPKEY& property,
+                               std::string* property_buffer);
 
   bool device_info_list_valid() {
     return device_info_list_ != INVALID_HANDLE_VALUE;