| Index: components/storage_monitor/udev_util_linux.cc
|
| diff --git a/components/storage_monitor/udev_util_linux.cc b/components/storage_monitor/udev_util_linux.cc
|
| index 142a54e28ea3ba412e3135031ea0941dc87c8d62..5a3a1173e4216a25d43b284c3605793cb65b8259 100644
|
| --- a/components/storage_monitor/udev_util_linux.cc
|
| +++ b/components/storage_monitor/udev_util_linux.cc
|
| @@ -5,17 +5,10 @@
|
| #include "components/storage_monitor/udev_util_linux.h"
|
|
|
| #include "base/files/file_path.h"
|
| +#include "device/udev_linux/udev.h"
|
|
|
| namespace storage_monitor {
|
|
|
| -void UdevDeleter::operator()(struct udev* udev) {
|
| - udev_unref(udev);
|
| -}
|
| -
|
| -void UdevDeviceDeleter::operator()(struct udev_device* device) {
|
| - udev_device_unref(device);
|
| -}
|
| -
|
| std::string GetUdevDevicePropertyValue(struct udev_device* udev_device,
|
| const char* key) {
|
| const char* value = udev_device_get_property_value(udev_device, key);
|
| @@ -25,10 +18,10 @@ std::string GetUdevDevicePropertyValue(struct udev_device* udev_device,
|
| bool GetUdevDevicePropertyValueByPath(const base::FilePath& device_path,
|
| const char* key,
|
| std::string* result) {
|
| - ScopedUdevObject udev(udev_new());
|
| + device::ScopedUdevPtr udev(udev_new());
|
| if (!udev.get())
|
| return false;
|
| - ScopedUdevDeviceObject device(udev_device_new_from_syspath(
|
| + device::ScopedUdevDevicePtr device(udev_device_new_from_syspath(
|
| udev.get(), device_path.value().c_str()));
|
| if (!device.get())
|
| return false;
|
|
|