[StorageMonitor] Move gallery name generation to StorageInfo.

components/storage_monitor/storage_monitor_win_unittest.cc

 // Copyright 2014 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 <windows.h>
 #include <dbt.h>
 
 #include <string>
 #include <vector>
 
@@ skipping 295 matching lines @@
       "dcim:mount1subdir", L"mount1subdir", 100);
   volume_mount_watcher_->AddDeviceForTesting(
       base::FilePath(FILE_PATH_LITERAL("F:\\mount2")),
       "dcim:mount2", L"mount2", 100);
   RunUntilIdle();
   EXPECT_EQ(init_storages + 3, monitor_->GetAllAvailableStorages().size());
 
   StorageInfo info;
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("F:\\dir")), &info));
-  EXPECT_EQ(L"", info.name());
-  EXPECT_EQ(L"F:\\ Drive", info.storage_label());
+  EXPECT_EQ(L"F:\\ Drive", info.GetDisplayName(false));
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("F:\\mount1")), &info));
-  EXPECT_EQ(L"mount1", info.name());
+  EXPECT_EQ(L"mount1", info.GetDisplayName(false));
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("F:\\mount1\\dir")), &info));
-  EXPECT_EQ(L"mount1", info.name());
+  EXPECT_EQ(L"mount1", info.GetDisplayName(false));
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("F:\\mount2\\dir")), &info));
-  EXPECT_EQ(L"mount2", info.name());
+  EXPECT_EQ(L"mount2", info.GetDisplayName(false));
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("F:\\mount1\\subdir")), &info));
-  EXPECT_EQ(L"mount1subdir", info.name());
+  EXPECT_EQ(L"mount1subdir", info.GetDisplayName(false));
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("F:\\mount1\\subdir\\dir")), &info));
-  EXPECT_EQ(L"mount1subdir", info.name());
+  EXPECT_EQ(L"mount1subdir", info.GetDisplayName(false));
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(
       base::FilePath(ASCIIToUTF16("F:\\mount1\\subdir\\dir\\dir")), &info));
-  EXPECT_EQ(L"mount1subdir", info.name());
+  EXPECT_EQ(L"mount1subdir", info.GetDisplayName(false));
 }
 
 TEST_F(StorageMonitorWinTest, DevicesAttachedHighBoundary) {
   DeviceIndices device_indices;
   device_indices.push_back(25);
 
   DoMassStorageDeviceAttachedTest(device_indices);
 }
 
 TEST_F(StorageMonitorWinTest, DevicesAttachedLowBoundary) {
@@ skipping 122 matching lines @@
                                                &device_info));
 
   // A connected removable device.
   base::FilePath removable_device(L"F:\\");
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(removable_device, &device_info));
 
   StorageInfo info;
   ASSERT_TRUE(volume_mount_watcher_->GetDeviceInfo(removable_device, &info));
   EXPECT_TRUE(StorageInfo::IsRemovableDevice(info.device_id()));
   EXPECT_EQ(info.device_id(), device_info.device_id());
-  EXPECT_EQ(info.name(), device_info.name());
+  EXPECT_EQ(info.GetDisplayName(false), device_info.GetDisplayName(false));
   EXPECT_EQ(info.location(), device_info.location());
   EXPECT_EQ(1000000, info.total_size_in_bytes());
 
   // A fixed device.
   base::FilePath fixed_device(L"N:\\");
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(fixed_device, &device_info));
 
   ASSERT_TRUE(volume_mount_watcher_->GetDeviceInfo(
       fixed_device, &info));
   EXPECT_FALSE(StorageInfo::IsRemovableDevice(info.device_id()));
   EXPECT_EQ(info.device_id(), device_info.device_id());
-  EXPECT_EQ(info.name(), device_info.name());
+  EXPECT_EQ(info.GetDisplayName(false), device_info.GetDisplayName(false));
   EXPECT_EQ(info.location(), device_info.location());
 }
 
 // Test to verify basic MTP storage attach and detach notifications.
 TEST_F(StorageMonitorWinTest, MTPDeviceBasicAttachDetach) {
   DoMTPDeviceTest(TestPortableDeviceWatcherWin::kMTPDeviceWithValidInfo, true);
   DoMTPDeviceTest(TestPortableDeviceWatcherWin::kMTPDeviceWithValidInfo, false);
 }
 
 // When a MTP storage device with invalid storage label and id is
@@ skipping 40 matching lines @@
         TestPortableDeviceWatcherWin::kMTPDeviceWithValidInfo);
     EXPECT_EQ(expected, pnp_device_id);
     EXPECT_EQ(it->object_persistent_id,
               TestPortableDeviceWatcherWin::GetMTPStorageUniqueId(
                   pnp_device_id, storage_object_id));
   }
   DoMTPDeviceTest(TestPortableDeviceWatcherWin::kMTPDeviceWithValidInfo, false);
 }
 
 }  // namespace storage_monitor