Switch HidDeviceId from IORegistry path to IORegistry entry ID.

device/hid/hid_service_mac.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/hid/hid_service_mac.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/hid/IOHIDDevice.h>
 
 #include <set>
@@ skipping 122 matching lines @@
                             const ConnectCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   const auto& map_entry = devices().find(device_id);
   if (map_entry == devices().end()) {
     task_runner_->PostTask(FROM_HERE, base::Bind(callback, nullptr));
     return;
   }
   scoped_refptr<HidDeviceInfo> device_info = map_entry->second;
 
-  io_string_t service_path;
-  strncpy(service_path, device_id.c_str(), sizeof service_path);
+  base::ScopedCFTypeRef<CFDictionaryRef> matching_dict(
+      IORegistryEntryIDMatching(device_id));
+
   base::mac::ScopedIOObject<io_service_t> service(
-      IORegistryEntryFromPath(kIOMasterPortDefault, service_path));
+      IOServiceGetMatchingService(kIOMasterPortDefault, matching_dict.get()));
   if (!service.get()) {
-    HID_LOG(EVENT) << "IOService not found for path: " << device_id;
+    HID_LOG(EVENT) << "IOService not found for ID: " << device_id;
     task_runner_->PostTask(FROM_HERE, base::Bind(callback, nullptr));
     return;
   }
 
   base::ScopedCFTypeRef<IOHIDDeviceRef> hid_device(
       IOHIDDeviceCreate(kCFAllocatorDefault, service));
   if (!hid_device) {
     HID_LOG(EVENT) << "Unable to create IOHIDDevice object.";
     task_runner_->PostTask(FROM_HERE, base::Bind(callback, nullptr));
     return;
@@ skipping 46 matching lines @@
     }
   }
 }
 
 void HidServiceMac::RemoveDevices() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   io_service_t device;
   while ((device = IOIteratorNext(devices_removed_iterator_)) !=
          IO_OBJECT_NULL) {
-    io_string_t service_path;
-    IOReturn result =
-        IORegistryEntryGetPath(device, kIOServicePlane, service_path);
+    uint64_t entry_id;
+    IOReturn result = IORegistryEntryGetRegistryEntryID(device, &entry_id);
     if (result == kIOReturnSuccess) {
-      RemoveDevice(service_path);
+      RemoveDevice(entry_id);
     }
 
     // Release reference retained by AddDevices above.
     IOObjectRelease(device);
     // Release the reference retained by IOIteratorNext.
     IOObjectRelease(device);
   }
 }
 
 // static
 scoped_refptr<HidDeviceInfo> HidServiceMac::CreateDeviceInfo(
     io_service_t service) {
-  io_string_t service_path;
-  IOReturn result =
-      IORegistryEntryGetPath(service, kIOServicePlane, service_path);
+  uint64_t entry_id;
+  IOReturn result = IORegistryEntryGetRegistryEntryID(service, &entry_id);
   if (result != kIOReturnSuccess) {
-    HID_LOG(EVENT) << "Failed to get IOService path: " << HexErrorCode(result);
+    HID_LOG(EVENT) << "Failed to get IORegistryEntry ID: "
+                   << HexErrorCode(result);
     return nullptr;
   }
 
   base::ScopedCFTypeRef<IOHIDDeviceRef> hid_device(
       IOHIDDeviceCreate(kCFAllocatorDefault, service));
   if (!hid_device) {
-    HID_LOG(EVENT) << "Unable to create IOHIDDevice object for " << service_path
-                   << ".";
+    HID_LOG(EVENT) << "Unable to create IOHIDDevice object for new device.";
     return nullptr;
   }
 
   std::vector<uint8> report_descriptor;
   if (!TryGetHidDataProperty(hid_device, CFSTR(kIOHIDReportDescriptorKey),
                              &report_descriptor)) {
-    HID_LOG(EVENT) << "Unable to get report descriptor for " << service_path
-                   << ".";
+    HID_LOG(EVENT) << "Unable to get report descriptor for new device.";
     return nullptr;
   }
 
   return new HidDeviceInfo(
-      service_path, GetHidIntProperty(hid_device, CFSTR(kIOHIDVendorIDKey)),
+      entry_id, GetHidIntProperty(hid_device, CFSTR(kIOHIDVendorIDKey)),
       GetHidIntProperty(hid_device, CFSTR(kIOHIDProductIDKey)),
       GetHidStringProperty(hid_device, CFSTR(kIOHIDProductKey)),
       GetHidStringProperty(hid_device, CFSTR(kIOHIDSerialNumberKey)),
       kHIDBusTypeUSB,  // TODO(reillyg): Detect Bluetooth. crbug.com/443335
       report_descriptor);
 }
 
 }  // namespace device