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

chrome/browser/system_monitor/media_storage_util.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.
 
 // chrome::MediaStorageUtil implementation.
 
 #include "chrome/browser/system_monitor/media_storage_util.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #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)
 #include "chrome/browser/system_monitor/removable_device_notifications_chromeos.h"
 #elif defined(OS_LINUX)
 #include "chrome/browser/system_monitor/removable_device_notifications_linux.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/system_monitor/removable_device_notifications_mac.h"
 #elif defined(OS_WIN)
 #include "chrome/browser/system_monitor/removable_device_notifications_window_win.h"
@@ skipping 222 matching lines @@
   if (!found_device) {
     MediaTransferProtocolDeviceObserverLinux* mtp_manager =
         MediaTransferProtocolDeviceObserverLinux::GetInstance();
     found_device = mtp_manager->GetStorageInfoForPath(path, &device_info);
   }
 #endif
 
   if (found_device && IsRemovableDevice(device_info.device_id)) {
     if (device_id)
       *device_id = device_info.device_id;
-
-    FilePath sub_folder_path;
-    if (device_name || relative_path) {
-      bool success = FilePath(device_info.location)
-          .AppendRelativePath(path, &sub_folder_path);
+    if (device_name)
+      *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 (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;
-#endif
-    }
-
-    if (relative_path)
-      *relative_path = sub_folder_path;
     return true;
   }
 
   // On Posix systems, there's one root so any absolute path could be valid.
 #if !defined(OS_POSIX)
   if (!found_device)
     return false;
 #endif
 
   if (device_id)
@@ skipping 48 matching lines @@
 
 // static
 void MediaStorageUtil::SetGetDeviceInfoFromPathFunctionForTesting(
     GetDeviceInfoFromPathFunction function) {
   g_test_get_device_info_from_path_function = function;
 }
 
 MediaStorageUtil::MediaStorageUtil() {}
 
 }  // namespace chrome