[StorageMonitor] Move gallery name generation to StorageInfo.

components/storage_monitor/storage_monitor_chromeos_unittest.cc

Index: components/storage_monitor/storage_monitor_chromeos_unittest.cc
diff --git a/components/storage_monitor/storage_monitor_chromeos_unittest.cc b/components/storage_monitor/storage_monitor_chromeos_unittest.cc
index 60f5364f19e0961d3ff3cd92d6e6d6719decc401..dd859d7dd9ba4d049f22bbd8722c88f34b50cb31 100644
--- a/components/storage_monitor/storage_monitor_chromeos_unittest.cc
+++ b/components/storage_monitor/storage_monitor_chromeos_unittest.cc
@@ -271,7 +271,6 @@ TEST_F(StorageMonitorCrosTest, BasicAttachDetach) {
   EXPECT_EQ(0, observer().detach_calls());
   EXPECT_EQ(GetDCIMDeviceId(kUniqueId1),
             observer().last_attached().device_id());
-  EXPECT_EQ(base::string16(), observer().last_attached().name());
   EXPECT_EQ(mount_path1.value(), observer().last_attached().location());
 
   UnmountDevice(chromeos::MOUNT_ERROR_NONE, mount_info);
@@ -299,7 +298,6 @@ TEST_F(StorageMonitorCrosTest, BasicAttachDetach) {
   EXPECT_EQ(1, observer().detach_calls());
   EXPECT_EQ(GetDCIMDeviceId(kUniqueId2),
             observer().last_attached().device_id());
-  EXPECT_EQ(base::string16(), observer().last_attached().name());
   EXPECT_EQ(mount_path2.value(), observer().last_attached().location());
 
   UnmountDevice(chromeos::MOUNT_ERROR_NONE, mount_info2);
@@ -334,7 +332,6 @@ TEST_F(StorageMonitorCrosTest, NoDCIM) {
   EXPECT_EQ(1, observer().attach_calls());
   EXPECT_EQ(0, observer().detach_calls());
   EXPECT_EQ(device_id, observer().last_attached().device_id());
-  EXPECT_EQ(base::string16(), observer().last_attached().name());
   EXPECT_EQ(mount_path.value(), observer().last_attached().location());
 }
 
@@ -411,7 +408,6 @@ TEST_F(StorageMonitorCrosTest, SDCardAttachDetach) {
   EXPECT_EQ(0, observer().detach_calls());
   EXPECT_EQ(GetDCIMDeviceId(kUniqueId2),
             observer().last_attached().device_id());
-  EXPECT_EQ(base::string16(), observer().last_attached().name());
   EXPECT_EQ(mount_path1.value(), observer().last_attached().location());
 
   UnmountDevice(chromeos::MOUNT_ERROR_NONE, mount_info1);
@@ -439,7 +435,6 @@ TEST_F(StorageMonitorCrosTest, SDCardAttachDetach) {
   EXPECT_EQ(1, observer().detach_calls());
   EXPECT_EQ(GetDCIMDeviceId(kUniqueId2),
             observer().last_attached().device_id());
-  EXPECT_EQ(base::string16(), observer().last_attached().name());
   EXPECT_EQ(mount_path2.value(), observer().last_attached().location());
 
   UnmountDevice(chromeos::MOUNT_ERROR_NONE, mount_info2);
@@ -469,7 +464,6 @@ TEST_F(StorageMonitorCrosTest, AttachDeviceWithEmptyLabel) {
   EXPECT_EQ(0, observer().detach_calls());
   EXPECT_EQ(GetDCIMDeviceId(kUniqueId1),
             observer().last_attached().device_id());
-  EXPECT_EQ(base::string16(), observer().last_attached().name());
   EXPECT_EQ(mount_path1.value(), observer().last_attached().location());
 
   UnmountDevice(chromeos::MOUNT_ERROR_NONE, mount_info);
@@ -499,7 +493,6 @@ TEST_F(StorageMonitorCrosTest, GetStorageSize) {
   EXPECT_EQ(0, observer().detach_calls());
   EXPECT_EQ(GetDCIMDeviceId(kUniqueId1),
             observer().last_attached().device_id());
-  EXPECT_EQ(base::string16(), observer().last_attached().name());
   EXPECT_EQ(mount_path1.value(), observer().last_attached().location());
 
   EXPECT_EQ(kDevice1SizeInBytes, GetDeviceStorageSize(mount_path1.value()));