[StorageMonitor] Move gallery name generation to StorageInfo.

chrome/browser/media_galleries/media_galleries_preferences_unittest.cc

Index: chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
diff --git a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
index bbcab9e62fb5acc07367489f19ab1f2451ce964c..1624f862614c28878cf7accc52106f70aee827c3 100644
--- a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
+++ b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
@@ -842,11 +842,6 @@ TEST(MediaGalleryPrefInfoTest, NameGeneration) {
   info.device_id = StorageInfo::MakeDeviceId(
       StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM, "unique");
 
-  EXPECT_EQ(ASCIIToUTF16("override"), info.GetGalleryDisplayName());
-
-  info.display_name = ASCIIToUTF16("o2");
-  EXPECT_EQ(ASCIIToUTF16("o2"), info.GetGalleryDisplayName());
-
   EXPECT_EQ(l10n_util::GetStringUTF16(
                 IDS_MEDIA_GALLERIES_DIALOG_DEVICE_NOT_ATTACHED),
             info.GetGalleryAdditionalDetails());
@@ -859,16 +854,6 @@ TEST(MediaGalleryPrefInfoTest, NameGeneration) {
                 IDS_MEDIA_GALLERIES_DIALOG_DEVICE_ATTACHED),
             info.GetGalleryAdditionalDetails());
 
-  info.volume_label = ASCIIToUTF16("vol");
-  info.vendor_name = ASCIIToUTF16("vendor");
-  info.model_name = ASCIIToUTF16("model");
-  EXPECT_EQ(ASCIIToUTF16("o2"), info.GetGalleryDisplayName());
-
-  info.display_name = string16();
-  EXPECT_EQ(ASCIIToUTF16("vol"), info.GetGalleryDisplayName());
-  info.volume_label = string16();
-  EXPECT_EQ(ASCIIToUTF16("vendor, model"), info.GetGalleryDisplayName());
-
   info.device_id = StorageInfo::MakeDeviceId(
       StorageInfo::FIXED_MASS_STORAGE, "unique");
   EXPECT_EQ(base::FilePath(FILE_PATH_LITERAL("unique")).AsUTF8Unsafe(),