[StorageMonitor] Move gallery name generation to StorageInfo.

chrome/browser/storage_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.
 
 #include "chrome/browser/storage_monitor/media_storage_util.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 162 matching lines @@
   // TODO(gbillock): Make sure return values from that class are definitive,
   // and don't do this here.
   info.set_device_id(
       StorageInfo::MakeDeviceId(StorageInfo::FIXED_MASS_STORAGE,
                                 path.AsUTF8Unsafe()));
   *device_info = info;
   *relative_path = base::FilePath();
   return true;
 }
 
+string16 MediaStorageUtil::GetGalleryDisplayNameFromPath(
+    const base::FilePath& absolute_path) {
+  StorageInfo storage_info;
+  base::FilePath relative_path;
+  if (!GetDeviceInfoFromPath(absolute_path, &storage_info, &relative_path))

[vandebo (ex-Chrome), 2014/01/08 19:46:25]

I think this ends up jumping through more hoops than we need to. - This change
generally calls MediaGalleryPrefInfo::AbsolutePath() to pass into this function.

Instead, I suggest adding a method to MediaGalleryPrefInfo that will give you
back an StorageInfo.  Then if you have a MediaGalleryPrefInfo and want the
display name, you can just do pref_info.MakeStorageInfo().GetDisplayName()

[Haojian Wu, 2014/01/20 09:43:00]

Done. I keep this function(just invoke StorageInfo::GetDisplayName) in
MediaGalleryPrefInfo.

+    return string16();
+  // Set media gallery absolute path to StorageInfo.
+  storage_info.set_location(absolute_path.value());
+  return storage_info.GetDisplayName();
+}
+
 // static
 base::FilePath MediaStorageUtil::FindDevicePathById(
     const std::string& device_id) {
   StorageInfo::Type type;
   std::string unique_id;
   if (!StorageInfo::CrackDeviceId(device_id, &type, &unique_id))
     return base::FilePath();
 
   if (type == StorageInfo::FIXED_MASS_STORAGE ||
       type == StorageInfo::ITUNES ||
@@ skipping 44 matching lines @@
 bool MediaStorageUtil::IsRemovableStorageAttached(const std::string& id) {
   StorageInfoList devices =
       StorageMonitor::GetInstance()->GetAllAvailableStorages();
   for (StorageInfoList::const_iterator it = devices.begin();
        it != devices.end(); ++it) {
     if (StorageInfo::IsRemovableDevice(id) && it->device_id() == id)
       return true;
   }
   return false;
 }