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

content/browser/udev_linux.h

 // Copyright (c) 2012 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.
 
 // UdevLinux listens for device change notifications from udev and runs
 // callbacks when notifications occur.
 //
 // UdevLinux must be created on a MessageLoop of TYPE_IO.
 // UdevLinux is not thread-safe.
 //
@@ skipping 24 matching lines @@
 
 #ifndef CONTENT_BROWSER_UDEV_LINUX_H_
 #define CONTENT_BROWSER_UDEV_LINUX_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_pump_libevent.h"
+#include "device/udev_linux/scoped_udev.h"
 
 extern "C" {
 struct udev;
 struct udev_device;
 struct udev_monitor;
 }
 
 namespace content {
 
 class UdevLinux : public base::MessagePumpLibevent::Watcher {
@@ skipping 21 matching lines @@
   // Returns the udev handle to be passed into other udev_*() functions.
   udev* udev_handle();
 
  private:
   // base::MessagePump:Libevent::Watcher implementation.
   virtual void OnFileCanReadWithoutBlocking(int fd) override;
   virtual void OnFileCanWriteWithoutBlocking(int fd) override;
 
   // libudev-related items, the main context, and the monitoring context to be
   // notified about changes to device states.
-  udev* udev_;
-  udev_monitor* monitor_;
+  device::ScopedUdevPtr udev_;
+  device::ScopedUdevMonitorPtr monitor_;
   int monitor_fd_;
   base::MessagePumpLibevent::FileDescriptorWatcher monitor_watcher_;
   UdevNotificationCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(UdevLinux);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_UDEV_LINUX_H_