Cleanup: Merge device/udev_linux/udev.{cc,h} into device/udev_linux/scoped_udev.h.

- Update header files elsewhere.
- Use ScopedUdev*Ptr classes in more places.

BUG=415212

Review URL: https://codereview.chromium.org/666653002

Cr-Commit-Position: refs/heads/master@{#300999}

3 files changed, 6 insertions, 6 deletions

diff --git a/components/storage_monitor/storage_monitor_linux.cc b/components/storage_monitor/storage_monitor_linux.cc
index 254fd5d..6b57f5c 100644
--- a/components/storage_monitor/storage_monitor_linux.cc
+++ b/components/storage_monitor/storage_monitor_linux.cc
@@ -26,7 +26,7 @@
 #include "components/storage_monitor/storage_info.h"
 #include "components/storage_monitor/udev_util_linux.h"
 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
-#include "device/udev_linux/udev.h"
+#include "device/udev_linux/scoped_udev.h"
 
 using content::BrowserThread;
 
diff --git a/components/storage_monitor/udev_util_linux.cc b/components/storage_monitor/udev_util_linux.cc
index 5a3a117..154f11c 100644
--- a/components/storage_monitor/udev_util_linux.cc
+++ b/components/storage_monitor/udev_util_linux.cc
@@ -5,11 +5,11 @@
 #include "components/storage_monitor/udev_util_linux.h"
 
 #include "base/files/file_path.h"
-#include "device/udev_linux/udev.h"
+#include "device/udev_linux/scoped_udev.h"
 
 namespace storage_monitor {
 
-std::string GetUdevDevicePropertyValue(struct udev_device* udev_device,
+std::string GetUdevDevicePropertyValue(udev_device* udev_device,
                                        const char* key) {
   const char* value = udev_device_get_property_value(udev_device, key);
   return value ? value : std::string();
diff --git a/components/storage_monitor/udev_util_linux.h b/components/storage_monitor/udev_util_linux.h
index f00048b..76b59ad 100644
--- a/components/storage_monitor/udev_util_linux.h
+++ b/components/storage_monitor/udev_util_linux.h
@@ -5,12 +5,12 @@
 #ifndef COMPONENTS_STORAGE_MONITOR_UDEV_UTIL_LINUX_H_
 #define COMPONENTS_STORAGE_MONITOR_UDEV_UTIL_LINUX_H_
 
-#include <libudev.h>
-
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 
+struct udev_device;
+
 namespace base {
 class FilePath;
 }
@@ -19,7 +19,7 @@ namespace storage_monitor {
 
 // Wrapper function for udev_device_get_property_value() that also checks for
 // valid but empty values.
-std::string GetUdevDevicePropertyValue(struct udev_device* udev_device,
+std::string GetUdevDevicePropertyValue(udev_device* udev_device,
                                        const char* key);
 
 // Helper for udev_device_new_from_syspath()/udev_device_get_property_value()