[StorageMonitor] Move gallery name generation to StorageInfo.

components/storage_monitor/storage_monitor_mac_unittest.mm

Index: components/storage_monitor/storage_monitor_mac_unittest.mm
diff --git a/components/storage_monitor/storage_monitor_mac_unittest.mm b/components/storage_monitor/storage_monitor_mac_unittest.mm
index f8d79b30b839e04b0d3aabb20a29e0680ee4dadf..382cfee977b732c77df3c7465c00ea773f58ad49 100644
--- a/components/storage_monitor/storage_monitor_mac_unittest.mm
+++ b/components/storage_monitor/storage_monitor_mac_unittest.mm
@@ -31,9 +31,8 @@ StorageInfo CreateStorageInfo(
     const base::FilePath& mount_point,
     uint64 size_bytes) {
   return StorageInfo(
-      device_id, base::string16(), mount_point.value(),
-      base::string16(), base::string16(), base::UTF8ToUTF16(model_name),
-      size_bytes);
+      device_id, mount_point.value(), base::string16(), base::string16(),
+      base::UTF8ToUTF16(model_name), size_bytes);
 }
 
 }  // namespace
@@ -84,7 +83,6 @@ TEST_F(StorageMonitorMacTest, AddRemove) {
   EXPECT_EQ(1, mock_storage_observer_->attach_calls());
   EXPECT_EQ(0, mock_storage_observer_->detach_calls());
   EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id());
-  EXPECT_EQ(base::string16(), mock_storage_observer_->last_attached().name());
   EXPECT_EQ(mount_point_.value(),
             mock_storage_observer_->last_attached().location());
 
@@ -101,7 +99,6 @@ TEST_F(StorageMonitorMacTest, UpdateVolumeName) {
   EXPECT_EQ(1, mock_storage_observer_->attach_calls());
   EXPECT_EQ(0, mock_storage_observer_->detach_calls());
   EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id());
-  EXPECT_EQ(base::string16(), mock_storage_observer_->last_attached().name());
   EXPECT_EQ(kTestSize,
             mock_storage_observer_->last_attached().total_size_in_bytes());
   EXPECT_EQ(mount_point_.value(),
@@ -116,7 +113,6 @@ TEST_F(StorageMonitorMacTest, UpdateVolumeName) {
   EXPECT_EQ(device_id_, mock_storage_observer_->last_detached().device_id());
   EXPECT_EQ(2, mock_storage_observer_->attach_calls());
   EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id());
-  EXPECT_EQ(base::string16(), mock_storage_observer_->last_attached().name());
   EXPECT_EQ(kTestSize * 2,
             mock_storage_observer_->last_attached().total_size_in_bytes());
   EXPECT_EQ(mount_point_.value(),
@@ -139,7 +135,6 @@ TEST_F(StorageMonitorMacTest, DCIM) {
   EXPECT_EQ(1, mock_storage_observer_->attach_calls());
   EXPECT_EQ(0, mock_storage_observer_->detach_calls());
   EXPECT_EQ(device_id, mock_storage_observer_->last_attached().device_id());
-  EXPECT_EQ(base::string16(), mock_storage_observer_->last_attached().name());
   EXPECT_EQ(mount_point.value(),
             mock_storage_observer_->last_attached().location());
 }
@@ -150,7 +145,6 @@ TEST_F(StorageMonitorMacTest, GetStorageInfo) {
   EXPECT_EQ(1, mock_storage_observer_->attach_calls());
   EXPECT_EQ(0, mock_storage_observer_->detach_calls());
   EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id());
-  EXPECT_EQ(base::string16(), mock_storage_observer_->last_attached().name());
   EXPECT_EQ(mount_point_.value(),
             mock_storage_observer_->last_attached().location());
 
@@ -158,7 +152,6 @@ TEST_F(StorageMonitorMacTest, GetStorageInfo) {
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(mount_point_.AppendASCII("foo"),
                                               &info));
   EXPECT_EQ(device_id_, info.device_id());
-  EXPECT_EQ(base::string16(), info.name());
   EXPECT_EQ(mount_point_.value(), info.location());
   EXPECT_EQ(kTestSize, info.total_size_in_bytes());