Revert 167606 - [Media Gallery][ChromeOS] Improve device media gallery names.

chrome/browser/system_monitor/removable_device_notifications_chromeos.cc

 // Copyright (c) 2012 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.
 
 // chromeos::RemovableDeviceNotificationsCros implementation.
 
 #include "chrome/browser/system_monitor/removable_device_notifications_chromeos.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
-#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/system_monitor/media_device_notifications_utils.h"
 #include "chrome/browser/system_monitor/media_storage_util.h"
 #include "chrome/browser/system_monitor/removable_device_constants.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
 
 using base::SystemMonitor;
 
 namespace {
 
-// Constructs a device name using label or manufacturer (vendor and product)
-// name details.
+// Construct a device name using label or manufacturer (vendor and product) name
+// details.
 string16 GetDeviceName(const disks::DiskMountManager::Disk& disk) {
-  if (disk.device_type() == DEVICE_TYPE_SD) {
-    // Mount path of an SD card will be one of the following:
-    // (1) /media/removable/<volume_label>
-    // (2) /media/removable/SD Card
-    // If the volume label is available, mount path will be (1) else (2).
-    FilePath mount_point(disk.mount_path());
-    const string16 display_name(mount_point.BaseName().LossyDisplayName());
-    if (!display_name.empty())
-      return display_name;
+  std::string device_name = disk.device_label();
+  if (device_name.empty()) {
+    device_name = disk.vendor_name();
+    const std::string& product_name = disk.product_name();
+    if (!product_name.empty()) {
+      if (!device_name.empty())
+        device_name += " ";
+      device_name += product_name;
+    }
   }
-
-  const std::string& device_label = disk.device_label();
-  if (!device_label.empty() && IsStringUTF8(device_label))
-    return UTF8ToUTF16(device_label);
-  return chrome::GetFullProductName(disk.vendor_name(), disk.product_name());
+  return UTF8ToUTF16(device_name);
 }
 
-// Constructs a device id using uuid or manufacturer (vendor and product) id
+// Construct a device id using uuid or manufacturer (vendor and product) id
 // details.
 std::string MakeDeviceUniqueId(const disks::DiskMountManager::Disk& disk) {
   std::string uuid = disk.fs_uuid();
   if (!uuid.empty())
     return chrome::kFSUniqueIdPrefix + uuid;
 
   // If one of the vendor or product information is missing, its value in the
   // string is empty.
   // Format: VendorModelSerial:VendorInfo:ModelInfo:SerialInfo
   // TODO(kmadhusu) Extract serial information for the disks and append it to
   // the device unique id.
   const std::string& vendor = disk.vendor_id();
   const std::string& product = disk.product_id();
   if (vendor.empty() && product.empty())
     return std::string();
   return chrome::kVendorModelSerialPrefix + vendor + ":" + product + ":";
 }
 
 static RemovableDeviceNotificationsCros*
     g_removable_device_notifications_chromeos = NULL;
 
 // Returns true if the requested device is valid, else false. On success, fills
-// in |unique_id|, |device_label| and |storage_size_in_bytes|.
-bool GetDeviceInfo(const std::string& source_path,
-                   std::string* unique_id,
-                   string16* device_label,
-                   uint64* storage_size_in_bytes) {
+// in |unique_id| and |device_label|
+bool GetDeviceInfo(const std::string& source_path, std::string* unique_id,
+                   string16* device_label) {
+  // Get the media device uuid and label if exists.
   const disks::DiskMountManager::Disk* disk =
       disks::DiskMountManager::GetInstance()->FindDiskBySourcePath(source_path);
   if (!disk || disk->device_type() == DEVICE_TYPE_UNKNOWN)
     return false;
 
   if (unique_id)
     *unique_id = MakeDeviceUniqueId(*disk);
 
   if (device_label)
     *device_label = GetDeviceName(*disk);
-
-  if (storage_size_in_bytes)
-    *storage_size_in_bytes = disk->total_size_in_bytes();
   return true;
 }
 
 }  // namespace
 
+using chrome::MediaStorageUtil;
 using content::BrowserThread;
 
 RemovableDeviceNotificationsCros::RemovableDeviceNotificationsCros() {
   DCHECK(disks::DiskMountManager::GetInstance());
   DCHECK(!g_removable_device_notifications_chromeos);
   g_removable_device_notifications_chromeos = this;
   disks::DiskMountManager::GetInstance()->AddObserver(this);
   CheckExistingMountPointsOnUIThread();
 }
 
@@ skipping 63 matching lines @@
           base::Bind(
               &RemovableDeviceNotificationsCros::CheckMountedPathOnFileThread,
               this, mount_info));
       break;
     }
     case disks::DiskMountManager::UNMOUNTING: {
       MountMap::iterator it = mount_map_.find(mount_info.mount_path);
       if (it == mount_map_.end())
         return;
       SystemMonitor::Get()->ProcessRemovableStorageDetached(
-          it->second.storage_info.device_id);
+          it->second.device_id);
       mount_map_.erase(it);
       break;
     }
   }
 }
 
 bool RemovableDeviceNotificationsCros::GetDeviceInfoForPath(
     const FilePath& path,
     SystemMonitor::RemovableStorageInfo* device_info) const {
   if (!path.IsAbsolute())
     return false;
 
   FilePath current = path;
   while (!ContainsKey(mount_map_, current.value()) &&
          current != current.DirName()) {
     current = current.DirName();
   }
 
   MountMap::const_iterator info_it = mount_map_.find(current.value());
   if (info_it == mount_map_.end())
     return false;
 
   if (device_info)
-    *device_info = info_it->second.storage_info;
+    *device_info = info_it->second;
   return true;
 }
 
-uint64 RemovableDeviceNotificationsCros::GetStorageSize(
-    const std::string& device_location) const {
-  MountMap::const_iterator info_it = mount_map_.find(device_location);
-  return (info_it != mount_map_.end()) ?
-      info_it->second.storage_size_in_bytes : 0;
-}
-
 void RemovableDeviceNotificationsCros::CheckMountedPathOnFileThread(
     const disks::DiskMountManager::MountPointInfo& mount_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   bool has_dcim = chrome::IsMediaDevice(mount_info.mount_path);
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&RemovableDeviceNotificationsCros::AddMountedPathOnUIThread,
                  this, mount_info, has_dcim));
 }
 
 void RemovableDeviceNotificationsCros::AddMountedPathOnUIThread(
     const disks::DiskMountManager::MountPointInfo& mount_info, bool has_dcim) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (ContainsKey(mount_map_, mount_info.mount_path)) {
     // CheckExistingMountPointsOnUIThread() added the mount point information
     // in the map before the device attached handler is called. Therefore, an
     // entry for the device already exists in the map.
     return;
   }
 
   // Get the media device uuid and label if exists.
   std::string unique_id;
   string16 device_label;
-  uint64 storage_size_in_bytes;
-  if (!GetDeviceInfo(mount_info.source_path, &unique_id, &device_label,
-                     &storage_size_in_bytes))
+  if (!GetDeviceInfo(mount_info.source_path, &unique_id, &device_label))
     return;
 
   // Keep track of device uuid and label, to see how often we receive empty
   // values.
-  chrome::MediaStorageUtil::RecordDeviceInfoHistogram(true, unique_id,
-                                                      device_label);
+  MediaStorageUtil::RecordDeviceInfoHistogram(true, unique_id, device_label);
   if (unique_id.empty() || device_label.empty())
     return;
 
-  chrome::MediaStorageUtil::Type type = has_dcim ?
-      chrome::MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM :
-      chrome::MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM;
+  MediaStorageUtil::Type type = has_dcim ?
+      MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM :
+      MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM;
 
   std::string device_id = chrome::MediaStorageUtil::MakeDeviceId(type,
                                                                  unique_id);
-  StorageObjectInfo object_info = {
-      base::SystemMonitor::RemovableStorageInfo(device_id, device_label,
-                                                mount_info.mount_path),
-      storage_size_in_bytes
-  };
-  mount_map_.insert(std::make_pair(mount_info.mount_path, object_info));
+  SystemMonitor::RemovableStorageInfo info(device_id, device_label,
+                                           mount_info.mount_path);
+  mount_map_.insert(std::make_pair(mount_info.mount_path, info));
   SystemMonitor::Get()->ProcessRemovableStorageAttached(
       device_id,
-      chrome::GetDisplayNameForDevice(storage_size_in_bytes, device_label),
+      device_label,
       mount_info.mount_path);
 }
 
-}  // namespace chromeos
+}  // namespace chrome