Fix serial device PID and VID parsing

device/serial/serial_device_enumerator_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_device_enumerator_win.h"
 
 #include <windows.h>
 
 #include <devguid.h>
 #include <setupapi.h>
@@ skipping 48 matching lines @@
 // value to display_name, and returns whether the operation was successful.
 bool GetDisplayName(const std::string friendly_name,
                     std::string* display_name) {
   return RE2::PartialMatch(friendly_name, "(.*) \\(COM[0-9]+\\)", display_name);
 }
 
 // Searches for the vendor ID in the device's hardware ID, assigns its value to
 // vendor_id, and returns whether the operation was successful.
 bool GetVendorID(const std::string hardware_id, uint32_t* vendor_id) {
   std::string vendor_id_str;
-  return RE2::PartialMatch(hardware_id, "VID_([0-9]+)", &vendor_id_str) &&
+  return RE2::PartialMatch(hardware_id, "VID_([0-9a-fA-F]+)", &vendor_id_str) &&
          base::HexStringToUInt(vendor_id_str, vendor_id);
 }
 
 // Searches for the product ID in the device's product ID, assigns its value to
 // product_id, and returns whether the operation was successful.
 bool GetProductID(const std::string hardware_id, uint32_t* product_id) {
   std::string product_id_str;
-  return RE2::PartialMatch(hardware_id, "PID_([0-9]+)", &product_id_str) &&
+  return RE2::PartialMatch(hardware_id, "PID_([0-9a-fA-F]+)",
+                           &product_id_str) &&
          base::HexStringToUInt(product_id_str, product_id);
 }
 
 // Returns value clamped to the range of [min, max].
 int Clamp(int value, int min, int max) {
   return std::min(std::max(value, min), max);
 }
 
 // Returns an array of devices as retrieved through the new method of
 // enumerating serial devices (SetupDi).  This new method gives more information
@@ skipping 95 matching lines @@
   }
 
   mojo::Array<mojo::String> paths;
   mojo::Array<serial::DeviceInfoPtr> devices;
   deviceMap.DecomposeMapTo(&paths, &devices);
 
   return devices;
 }
 
 }  // namespace device