Uprev libchrome to r456626
BUG=b:37434548
TEST=Try.
Change-Id: Ide27b61f5418bd884fe2428f8a13a21c8a6f4514
Reviewed-on: https://chromium-review.googlesource.com/1267576
Commit-Ready: Hidehiko Abe <hidehiko@chromium.org>
Tested-by: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Luis Hector Chavez <lhchavez@chromium.org>
diff --git a/src/udev_device_manager.cc b/src/udev_device_manager.cc
index 5f0a974..5098ba5 100644
--- a/src/udev_device_manager.cc
+++ b/src/udev_device_manager.cc
@@ -83,7 +83,8 @@
UdevDeviceManager::UdevDeviceManager()
: udev_(udev_new()),
- monitor_(udev_monitor_new_from_netlink(udev_.get(), "udev")) {
+ monitor_(udev_monitor_new_from_netlink(udev_.get(), "udev")),
+ watcher_(FROM_HERE) {
CHECK(udev_.get()) << "udev_new() returned nullptr";
CHECK(monitor_.get()) << "udev_monitor_new_from_netlink() returned nullptr";
}
@@ -187,12 +188,12 @@
UdevAction action = StringToAction(action_str);
switch (action) {
case UdevAction::kAdd:
- FOR_EACH_OBSERVER(UdevSubsystemObserver, observers_,
- OnDeviceAdded(device_path));
+ for (auto& observer : observers_)
+ observer.OnDeviceAdded(device_path);
break;
case UdevAction::kRemove:
- FOR_EACH_OBSERVER(UdevSubsystemObserver, observers_,
- OnDeviceRemoved(device_path));
+ for (auto& observer : observers_)
+ observer.OnDeviceRemoved(device_path);
break;
default:
VLOG(1) << "Unhandled udev event received for tag '" << kAtrusTag