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

chrome/browser/system_monitor/media_storage_util.cc

Index: chrome/browser/system_monitor/media_storage_util.cc
diff --git a/chrome/browser/system_monitor/media_storage_util.cc b/chrome/browser/system_monitor/media_storage_util.cc
index e7f39cdc5bd66f4605835222ed0ac442caed5a2d..1344d80669688b4ae4b253f909c926b6d3519256 100644
--- a/chrome/browser/system_monitor/media_storage_util.cc
+++ b/chrome/browser/system_monitor/media_storage_util.cc
@@ -14,6 +14,7 @@
 #include "base/metrics/histogram.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/system_monitor/media_device_notifications_utils.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_CHROMEOS)
@@ -256,20 +257,29 @@ bool MediaStorageUtil::GetDeviceInfoFromPath(const FilePath& path,
   if (found_device && IsRemovableDevice(device_info.device_id)) {
     if (device_id)
       *device_id = device_info.device_id;
-    if (device_name)
+
+    FilePath sub_folder_path;
+    if (device_name || relative_path) {
+      bool success = FilePath(device_info.location)
+          .AppendRelativePath(path, &sub_folder_path);
+      DCHECK(success);
+    }
+
+    if (device_name) {
+#if defined(OS_CHROMEOS)
+      *device_name = GetDisplayNameForDevice(
+          notifier->GetStorageSize(device_info.location),
+          sub_folder_path.value().empty() ?
+              device_info.name :
+              sub_folder_path.BaseName().LossyDisplayName() +
+                  ASCIIToUTF16(" - ") + device_info.name);
+#else
       *device_name = device_info.name;
-    if (relative_path) {
-      *relative_path = FilePath();
-      FilePath mount_point(device_info.location);
-      bool success = mount_point.AppendRelativePath(path, relative_path);
-#if defined(OS_POSIX)
-      if (!relative_path->value().empty() && device_name) {
-        *device_name += ASCIIToUTF16(" (") +
-            relative_path->BaseName().LossyDisplayName() + ASCIIToUTF16(")");
-      }
 #endif
-      DCHECK(success);
     }
+
+    if (relative_path)
+      *relative_path = sub_folder_path;
     return true;
   }