Upstream version 5.34.98.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / storage_monitor / storage_monitor_linux.cc

diff --git a/src/chrome/browser/storage_monitor/storage_monitor_linux.cc b/src/chrome/browser/storage_monitor/storage_monitor_linux.cc
index 340e479..5e2cba1 100644 (file)
--- a/src/chrome/browser/storage_monitor/storage_monitor_linux.cc
+++ b/src/chrome/browser/storage_monitor/storage_monitor_linux.cc
@@ -111,23 +111,6 @@ uint64 GetDeviceStorageSize(const base::FilePath& device_path,
       total_size_in_bytes * 512 : 0;
 }
 
-// Constructs the device name from the device properties. If the device details
-// are unavailable, returns an empty string.
-void GetDeviceName(struct udev_device* device,
-                   string16* out_volume_label,
-                   string16* out_vendor_name,
-                   string16* out_model_name) {
-  std::string device_label = GetUdevDevicePropertyValue(device, kLabel);
-  std::string vendor_name = GetUdevDevicePropertyValue(device, kVendor);
-  std::string model_name = GetUdevDevicePropertyValue(device, kModel);
-  if (out_volume_label)
-    *out_volume_label = UTF8ToUTF16(device_label);
-  if (out_vendor_name)
-    *out_vendor_name = UTF8ToUTF16(vendor_name);
-  if (out_model_name)
-    *out_model_name = UTF8ToUTF16(model_name);
-}
-
 // Gets the device information using udev library.
 scoped_ptr<StorageInfo> GetDeviceInfo(const base::FilePath& device_path,
                                       const base::FilePath& mount_point) {
@@ -160,12 +143,12 @@ scoped_ptr<StorageInfo> GetDeviceInfo(const base::FilePath& device_path,
   if (!device.get())
     return storage_info.Pass();
 
-  string16 volume_label = UTF8ToUTF16(GetUdevDevicePropertyValue(device.get(),
-                                                                 kLabel));
-  string16 vendor_name = UTF8ToUTF16(GetUdevDevicePropertyValue(device.get(),
-                                                                kVendor));
-  string16 model_name = UTF8ToUTF16(GetUdevDevicePropertyValue(device.get(),
-                                                               kModel));
+  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));
 
   std::string unique_id = MakeDeviceUniqueId(device.get());
 
@@ -197,7 +180,7 @@ scoped_ptr<StorageInfo> GetDeviceInfo(const base::FilePath& device_path,
 
   storage_info.reset(new StorageInfo(
       StorageInfo::MakeDeviceId(type, unique_id),
-      string16(),
+      base::string16(),
       mount_point.value(),
       volume_label,
       vendor_name,