[StorageMonitor] Move gallery name generation to StorageInfo.

chrome/browser/media_galleries/media_galleries_preferences_unittest.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.
 
 // MediaGalleriesPreferences unit tests.
 
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
@@ skipping 824 matching lines @@
 
 TEST(MediaGalleryPrefInfoTest, NameGeneration) {
   ASSERT_TRUE(TestStorageMonitor::CreateAndInstall());
 
   MediaGalleryPrefInfo info;
   info.pref_id = 1;
   info.display_name = ASCIIToUTF16("override");
   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());
 
   info.last_attach_time = base::Time::Now();
   EXPECT_NE(l10n_util::GetStringUTF16(
                 IDS_MEDIA_GALLERIES_DIALOG_DEVICE_NOT_ATTACHED),
             info.GetGalleryAdditionalDetails());
   EXPECT_NE(l10n_util::GetStringUTF16(
                 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(),
             UTF16ToUTF8(info.GetGalleryTooltip()));
 
   TestStorageMonitor::RemoveSingleton();
 }