Linux: Unify udev scopers.

components/storage_monitor/storage_monitor_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.
 
 // StorageMonitorLinux implementation.
 
 #include "components/storage_monitor/storage_monitor_linux.h"
 
 #include <mntent.h>
 #include <stdio.h>
 
 #include <list>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/storage_monitor/media_storage_util.h"
 #include "components/storage_monitor/media_transfer_protocol_device_observer_linux.h"
 #include "components/storage_monitor/removable_device_constants.h"
 #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"
 
 using content::BrowserThread;
 
 namespace storage_monitor {
 
 typedef MtabWatcherLinux::MountPointDeviceMap MountPointDeviceMap;
 
 namespace {
 
 // udev device property constants.
@@ skipping 78 matching lines @@
 // Gets the device information using udev library.
 scoped_ptr<StorageInfo> GetDeviceInfo(const base::FilePath& device_path,
                                       const base::FilePath& mount_point) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DCHECK(!device_path.empty());
 
   scoped_ptr<StorageInfo> storage_info;
 
   ScopedGetDeviceInfoResultRecorder results_recorder;
 
-  ScopedUdevObject udev_obj(udev_new());
+  device::ScopedUdevPtr udev_obj(udev_new());
   if (!udev_obj.get())
     return storage_info.Pass();
 
   struct stat device_stat;
   if (stat(device_path.value().c_str(), &device_stat) < 0)
     return storage_info.Pass();
 
   char device_type;
   if (S_ISCHR(device_stat.st_mode))
     device_type = 'c';
   else if (S_ISBLK(device_stat.st_mode))
     device_type = 'b';
   else
     return storage_info.Pass();  // Not a supported type.
 
-  ScopedUdevDeviceObject device(
+  device::ScopedUdevDevicePtr device(
       udev_device_new_from_devnum(udev_obj.get(), device_type,
                                   device_stat.st_rdev));
   if (!device.get())
     return storage_info.Pass();
 
   base::string16 volume_label =
       base::UTF8ToUTF16(GetUdevDevicePropertyValue(device.get(), kLabel));
   base::string16 vendor_name =
       base::UTF8ToUTF16(GetUdevDevicePropertyValue(device.get(), kVendor));
   base::string16 model_name =
@@ skipping 343 matching lines @@
   mount_priority_map_[mount_device][mount_point] = removable;
   receiver()->ProcessAttach(*storage_info);
 }
 
 StorageMonitor* StorageMonitor::CreateInternal() {
   const base::FilePath kDefaultMtabPath("/etc/mtab");
   return new StorageMonitorLinux(kDefaultMtabPath);
 }
 
 }  // namespace storage_monitor