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

device/serial/serial_device_enumerator_linux.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/serial/serial_device_enumerator_linux.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 
 namespace device {
 
 namespace {
 
 const char kSerialSubsystem[] = "tty";
 
 const char kHostPathKey[] = "DEVNAME";
 const char kHostBusKey[] = "ID_BUS";
 const char kVendorIDKey[] = "ID_VENDOR_ID";
 const char kProductIDKey[] = "ID_MODEL_ID";
 const char kProductNameKey[] = "ID_MODEL";
 
-struct UdevEnumerateDeleter {
-  void operator()(udev_enumerate* enumerate) {
-    udev_enumerate_unref(enumerate);
-  }
-};
-
-struct UdevDeviceDeleter {
-  void operator()(udev_device* device) { udev_device_unref(device); }
-};
-
-typedef scoped_ptr<udev_enumerate, UdevEnumerateDeleter> ScopedUdevEnumeratePtr;
-typedef scoped_ptr<udev_device, UdevDeviceDeleter> ScopedUdevDevicePtr;
-}
+}  // namespace
 
 // static
 scoped_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create() {
   return scoped_ptr<SerialDeviceEnumerator>(new SerialDeviceEnumeratorLinux());
 }
 
 SerialDeviceEnumeratorLinux::SerialDeviceEnumeratorLinux() {
   udev_.reset(udev_new());
 }
 
@@ skipping 48 matching lines @@
         info->has_product_id = true;
       }
       if (product_name)
         info->display_name = product_name;
       devices.push_back(info.Pass());
     }
   }
   return devices.Pass();
 }
 
-void SerialDeviceEnumeratorLinux::UdevDeleter::operator()(udev* handle) {
-  udev_unref(handle);
-}
-
 }  // namespace device