Clean up DeviceInfoQueryWin.

device/serial/serial_io_handler_win.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/serial/serial_io_handler_win.h"
 
+#define INITGUID
+#include <devpkey.h>
+#include <setupapi.h>
 #include <windows.h>
-#include <setupapi.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "base/threading/thread_checker.h"
 #include "device/base/device_info_query_win.h"
 #include "device/base/device_monitor_win.h"
 #include "third_party/re2/src/re2/re2.h"
 
 namespace device {
@@ skipping 177 matching lines @@
 void SerialIoHandlerWin::OnDeviceRemoved(const std::string& device_path) {
   DCHECK(CalledOnValidThread());
 
   DeviceInfoQueryWin device_info_query;
   if (!device_info_query.device_info_list_valid()) {
     DVPLOG(1) << "Failed to create a device information set";
     return;
   }
 
   // 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)) {
     DVPLOG(1) << "Failed to get device interface data for " << device_path;
     return;
   }
 
   if (!device_info_query.GetDeviceInfo()) {
     DVPLOG(1) << "Failed to get device info for " << device_path;
     return;
   }
 
   std::string friendly_name;
-  if (!device_info_query.GetDeviceStringProperty(SPDRP_FRIENDLYNAME,
+  if (!device_info_query.GetDeviceStringProperty(DEVPKEY_Device_FriendlyName,
                                                  &friendly_name)) {
     DVPLOG(1) << "Failed to get device service property";
     return;
   }
 
   std::string com_port;
   if (!GetCOMPort(friendly_name, &com_port)) {
     DVPLOG(1) << "Failed to get port name from \"" << friendly_name << "\".";
     return;
   }
@@ skipping 298 matching lines @@
 std::string SerialIoHandler::MaybeFixUpPortName(const std::string& port_name) {
   // For COM numbers less than 9, CreateFile is called with a string such as
   // "COM1". For numbers greater than 9, a prefix of "\\\\.\\" must be added.
   if (port_name.length() > std::string("COM9").length())
     return std::string("\\\\.\\").append(port_name);
 
   return port_name;
 }
 
 }  // namespace device