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

device/hid/hid_service_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/hid/hid_service_linux.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "device/hid/hid_connection_linux.h"
 #include "device/hid/hid_device_info.h"
 #include "device/hid/hid_report_descriptor.h"
-#include "device/udev_linux/udev.h"
+#include "device/udev_linux/scoped_udev.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/sys_info.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/permission_broker_client.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace device {
 
 namespace {
@@ skipping 105 matching lines @@
   const char* subsystem = udev_device_get_subsystem(device);
   if (!subsystem || strcmp(subsystem, kHidrawSubsystem) != 0)
     return;
 
   HidDeviceInfo device_info;
   device_info.device_id = device_path;
 
   uint32_t int_property = 0;
   const char* str_property = NULL;
 
-  udev_device *parent = udev_device_get_parent(device);
+  udev_device* parent = udev_device_get_parent(device);
   if (!parent) {
     return;
   }
 
   const char* hid_id = udev_device_get_property_value(parent, kHIDID);
   if (!hid_id) {
     return;
   }
 
   std::vector<std::string> parts;
@@ skipping 62 matching lines @@
 
   const auto& map_entry = devices().find(device_id);
   if (map_entry == devices().end()) {
     callback.Run(nullptr);
   }
 
   callback.Run(new HidConnectionLinux(map_entry->second, device_node));
 }
 
 }  // namespace device