[StorageMonitor] Move gallery name generation to StorageInfo.

chrome/browser/extensions/api/media_galleries/media_galleries_api.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.
 
 // Implements the Chrome Extensions Media Galleries API.
 
 #include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h"
 
 #include <set>
 #include <string>
@@ skipping 293 matching lines @@
   MediaGalleriesPreferences* prefs = registry->GetPreferences(GetProfile());
 
   base::ListValue* list = new base::ListValue();
   const MediaGalleriesPrefInfoMap& galleries = prefs->known_galleries();
   for (MediaGalleryPrefIdSet::const_iterator it = permitted_gallery_ids.begin();
        it != permitted_gallery_ids.end(); ++it) {
     MediaGalleriesPrefInfoMap::const_iterator gallery_it = galleries.find(*it);
     DCHECK(gallery_it != galleries.end());
     const MediaGalleryPrefInfo& gallery = gallery_it->second;
     MediaGalleries::MediaFileSystemMetadata metadata;
-    metadata.name = base::UTF16ToUTF8(gallery.GetGalleryDisplayName());
+    metadata.name = base::UTF16ToUTF8(
+        MediaStorageUtil::GetGalleryDisplayNameFromPath(
+            gallery.AbsolutePath()));
     metadata.gallery_id = base::Uint64ToString(gallery.pref_id);
     metadata.is_removable = StorageInfo::IsRemovableDevice(gallery.device_id);
     metadata.is_media_device = StorageInfo::IsMediaDevice(gallery.device_id);
     metadata.is_available = ContainsKey(*available_devices, gallery.device_id);
     list->Append(metadata.ToValue().release());
   }
 
   SetResult(list);
   SendResponse(true);
 }
 
 }  // namespace extensions