[Media Gallery][Linux] Improve device media gallery names.

chrome/browser/system_monitor/removable_device_notifications_linux.cc

Index: chrome/browser/system_monitor/removable_device_notifications_linux.cc
diff --git a/chrome/browser/system_monitor/removable_device_notifications_linux.cc b/chrome/browser/system_monitor/removable_device_notifications_linux.cc
index db68742d6ebe584cd6091975a53a0c0a4abe27ea..d043e635c0a462353f9e2f2f9980c784b11b98d9 100644
--- a/chrome/browser/system_monitor/removable_device_notifications_linux.cc
+++ b/chrome/browser/system_monitor/removable_device_notifications_linux.cc
@@ -27,7 +27,6 @@
 
 namespace chrome {
 
-using base::SystemMonitor;
 using content::BrowserThread;
 
 namespace {
@@ -51,15 +50,14 @@ const char* const kKnownFileSystems[] = {
 
 // udev device property constants.
 const char kBlockSubsystemKey[] = "block";
-const char kDevName[] = "DEVNAME";
 const char kDiskDeviceTypeKey[] = "disk";
 const char kFsUUID[] = "ID_FS_UUID";
 const char kLabel[] = "ID_FS_LABEL";
 const char kModel[] = "ID_MODEL";
 const char kModelID[] = "ID_MODEL_ID";
 const char kRemovableSysAttr[] = "removable";
-const char kSerial[] = "ID_SERIAL";
 const char kSerialShort[] = "ID_SERIAL_SHORT";
+const char kSizeSysAttr[] = "size";
 const char kVendor[] = "ID_VENDOR";
 const char kVendorID[] = "ID_VENDOR_ID";
 
@@ -148,12 +146,57 @@ void RecordGetDeviceInfoResult(bool result) {
   UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.UdevRequestSuccess", result);
 }
 
+// Returns the storage partition size of the device specified by |device_path|.
+// If the requested information is unavailable, returns 0.
+uint64 GetDeviceStorageSize(const FilePath& device_path,
+                            struct udev_device* device) {
+  // sysfs provides the device size value, which is the actual size in bytes

[Lei Zhang, 2012/11/13 01:16:12]

// sysfs provides the device size in units of 512-byte blocks.

[kmadhusu, 2012/11/13 17:47:44]

Done.

+  // divided by 512.
+  const std::string partition_size = udev_device_get_sysattr_value(
+      device, kSizeSysAttr);
+
+  // Keep track of device size, to see how often this information is
+  // unavailable.
+  UMA_HISTOGRAM_BOOLEAN(
+      "RemovableDeviceNotificationsLinux.device_partition_size_available",
+      !partition_size.empty());
+
+  uint64 total_size_in_bytes = 0;
+  return (!partition_size.empty() &&

[Lei Zhang, 2012/11/13 01:16:12]

You don't need to check if it's empty. StringToUint64() cannot possible return
true for empty strings.

[kmadhusu, 2012/11/13 17:47:44]

Done.

+          base::StringToUint64(partition_size, &total_size_in_bytes)) ?
+      total_size_in_bytes * 512 : 0;
+}
+
+// Constructs the device name from the device properties. If the device details
+// are unavailable, returns an empty string.
+string16 GetDeviceName(struct udev_device* device) {
+  std::string device_label = GetUdevDevicePropertyValue(device, kLabel);
+  if (!device_label.empty() && IsStringUTF8(device_label))
+    return UTF8ToUTF16(device_label);
+
+  device_label = GetUdevDevicePropertyValue(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",
+      !device_label.empty());
+
+  const std::string name = GetFullProductName(
+      GetUdevDevicePropertyValue(device, kVendor),
+      GetUdevDevicePropertyValue(device, kModel));
+  if (!name.empty())
+    device_label += " " + name;
+  return IsStringUTF8(device_label) ? UTF8ToUTF16(device_label) : string16();
+}
+
 // Get the device information using udev library.
-// On success, returns true and fill in |unique_id|, |name|, and |removable|.
-void GetDeviceInfo(const FilePath& device_path, std::string* unique_id,
-                   string16* name, bool* removable) {
+// On success, returns true and fill in |unique_id|, |name|, |removable| and
+// |partition_size_in_bytes|.
+void GetDeviceInfo(const FilePath& device_path,
+                   std::string* unique_id,
+                   string16* name,
+                   bool* removable,
+                   uint64* partition_size_in_bytes) {
   DCHECK(!device_path.empty());
-
   ScopedUdevObject udev_obj(udev_new());
   if (!udev_obj.get()) {
     RecordGetDeviceInfoResult(false);
@@ -183,29 +226,11 @@ void GetDeviceInfo(const FilePath& device_path, std::string* unique_id,
     return;
   }
 
-  // Construct a device name using label or manufacturer (vendor and model)
-  // details.
-  if (name) {
-    std::string device_label = GetUdevDevicePropertyValue(device, kLabel);
-    if (device_label.empty())
-      device_label = GetUdevDevicePropertyValue(device, kSerial);
-    if (device_label.empty()) {
-      // Format: VendorInfo ModelInfo
-      // E.g.: KnCompany Model2010
-      device_label = GetUdevDevicePropertyValue(device, kVendor);
-      std::string model_name = GetUdevDevicePropertyValue(device, kModel);
-      if (device_label.empty())
-        device_label = model_name;
-      else if (!model_name.empty())
-        device_label += " " + model_name;
-    }
-    if (IsStringUTF8(device_label))
-      *name = UTF8ToUTF16(device_label);
-  }
+  if (name)
+    *name = GetDeviceName(device);
 
-  if (unique_id) {
+  if (unique_id)
     *unique_id = MakeDeviceUniqueId(device);
-  }
 
   if (removable) {
     const char* value = udev_device_get_sysattr_value(device,
@@ -221,6 +246,9 @@ void GetDeviceInfo(const FilePath& device_path, std::string* unique_id,
     }
     *removable = (value && atoi(value) == 1);
   }
+
+  if (partition_size_in_bytes)
+    *partition_size_in_bytes = GetDeviceStorageSize(device_path, device);
   RecordGetDeviceInfoResult(true);
 }
 
@@ -272,7 +300,7 @@ void RemovableDeviceNotificationsLinux::Init() {
 
 bool RemovableDeviceNotificationsLinux::GetDeviceInfoForPath(
     const FilePath& path,
-    SystemMonitor::RemovableStorageInfo* device_info) const {
+    base::SystemMonitor::RemovableStorageInfo* device_info) const {
   if (!path.IsAbsolute())
     return false;
 
@@ -292,6 +320,14 @@ bool RemovableDeviceNotificationsLinux::GetDeviceInfoForPath(
   return true;
 }
 
+uint64 RemovableDeviceNotificationsLinux::GetStorageSize(
+    const std::string& location) {
+  MountMap::const_iterator mount_info = mount_info_map_.find(
+      FilePath(location));
+  return (mount_info != mount_info_map_.end()) ?
+      mount_info->second.partition_size_in_bytes : 0;
+}
+
 void RemovableDeviceNotificationsLinux::OnFilePathChanged(const FilePath& path,
                                                           bool error) {
   if (path != mtab_path_) {
@@ -354,7 +390,7 @@ void RemovableDeviceNotificationsLinux::UpdateMtab() {
       if (MediaStorageUtil::IsRemovableDevice(old_iter->second.device_id)) {
         DCHECK(has_priority != priority->second.end());
         if (has_priority->second) {
-          SystemMonitor::Get()->ProcessRemovableStorageDetached(
+          base::SystemMonitor::Get()->ProcessRemovableStorageDetached(
               old_iter->second.device_id);
         }
         if (priority->second.size() > 1)
@@ -425,7 +461,9 @@ void RemovableDeviceNotificationsLinux::AddNewMount(
   std::string unique_id;
   string16 name;
   bool removable;
-  get_device_info_func_(mount_device, &unique_id, &name, &removable);
+  uint64 partition_size_in_bytes;
+  get_device_info_func_(mount_device, &unique_id, &name, &removable,
+                        &partition_size_in_bytes);
 
   // Keep track of device info details to see how often we get invalid values.
   MediaStorageUtil::RecordDeviceInfoHistogram(true, unique_id, name);
@@ -449,13 +487,15 @@ void RemovableDeviceNotificationsLinux::AddNewMount(
   mount_point_info.mount_device = mount_device;
   mount_point_info.device_id = device_id;
   mount_point_info.device_name = name;
+  mount_point_info.partition_size_in_bytes = partition_size_in_bytes;
 
   mount_info_map_[mount_point] = mount_point_info;
   mount_priority_map_[mount_device][mount_point] = removable;
 
   if (removable) {
-    SystemMonitor::Get()->ProcessRemovableStorageAttached(device_id, name,
-                                                          mount_point.value());
+    base::SystemMonitor::Get()->ProcessRemovableStorageAttached(
+        device_id, GetDisplayNameForDevice(partition_size_in_bytes, name),
+        mount_point.value());
   }
 }