Move GetUdevDevicePropertyValue from components/storage_monitor to device/udev_linux and rename to …

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>
@@ skipping 33 matching lines @@
 const char kModel[] = "ID_MODEL";
 const char kModelID[] = "ID_MODEL_ID";
 const char kRemovableSysAttr[] = "removable";
 const char kSerialShort[] = "ID_SERIAL_SHORT";
 const char kSizeSysAttr[] = "size";
 const char kVendor[] = "ID_VENDOR";
 const char kVendorID[] = "ID_VENDOR_ID";
 
 // Construct a device id using label or manufacturer (vendor and model) details.
 std::string MakeDeviceUniqueId(struct udev_device* device) {
-  std::string uuid = GetUdevDevicePropertyValue(device, kFsUUID);
+  std::string uuid = device::UdevDeviceGetPropertyValue(device, kFsUUID);
   // Keep track of device uuid, to see how often we receive empty uuid values.
   UMA_HISTOGRAM_BOOLEAN(
       "RemovableDeviceNotificationsLinux.device_file_system_uuid_available",
       !uuid.empty());
 
   if (!uuid.empty())
     return kFSUniqueIdPrefix + uuid;
 
   // If one of the vendor, model, serial information is missing, its value
   // in the string is empty.
   // Format: VendorModelSerial:VendorInfo:ModelInfo:SerialShortInfo
   // E.g.: VendorModelSerial:Kn:DataTravel_12.10:8000000000006CB02CDB
-  std::string vendor = GetUdevDevicePropertyValue(device, kVendorID);
-  std::string model = GetUdevDevicePropertyValue(device, kModelID);
-  std::string serial_short = GetUdevDevicePropertyValue(device,
-                                                        kSerialShort);
+  std::string vendor = device::UdevDeviceGetPropertyValue(device, kVendorID);
+  std::string model = device::UdevDeviceGetPropertyValue(device, kModelID);
+  std::string serial_short =
+      device::UdevDeviceGetPropertyValue(device, kSerialShort);
   if (vendor.empty() && model.empty() && serial_short.empty())
     return std::string();
 
   return kVendorModelSerialPrefix + vendor + ":" + model + ":" + serial_short;
 }
 
 // Records GetDeviceInfo result on destruction, to see how often we fail to get
 // device details.
 class ScopedGetDeviceInfoResultRecorder {
  public:
@@ skipping 59 matching lines @@
     device_type = 'b';
   else
     return storage_info.Pass();  // Not a supported type.
 
   device::ScopedUdevDevicePtr device(
       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 =
-      base::UTF8ToUTF16(GetUdevDevicePropertyValue(device.get(), kModel));
+  base::string16 volume_label = base::UTF8ToUTF16(
+      device::UdevDeviceGetPropertyValue(device.get(), kLabel));
+  base::string16 vendor_name = base::UTF8ToUTF16(
+      device::UdevDeviceGetPropertyValue(device.get(), kVendor));
+  base::string16 model_name = base::UTF8ToUTF16(
+      device::UdevDeviceGetPropertyValue(device.get(), kModel));
 
   std::string unique_id = MakeDeviceUniqueId(device.get());
 
   // Keep track of device info details to see how often we get invalid values.
   MediaStorageUtil::RecordDeviceInfoHistogram(true, unique_id, volume_label);
 
   const char* value =
       device::udev_device_get_sysattr_value(device.get(), kRemovableSysAttr);
   if (!value) {
     // |parent_device| is owned by |device| and does not need to be cleaned
@@ skipping 334 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