[StorageMonitor] Move gallery name generation to StorageInfo.

components/storage_monitor/test_volume_mount_watcher_win.cc

Index: components/storage_monitor/test_volume_mount_watcher_win.cc
diff --git a/components/storage_monitor/test_volume_mount_watcher_win.cc b/components/storage_monitor/test_volume_mount_watcher_win.cc
index 50c22b56b73321030097ddcd5cb72d823130fe97..746af6c41e16075be07128444aed12a22a7c3e82 100644
--- a/components/storage_monitor/test_volume_mount_watcher_win.cc
+++ b/components/storage_monitor/test_volume_mount_watcher_win.cc
@@ -76,8 +76,8 @@ bool GetMassStorageDeviceDetails(const base::FilePath& device_path,
   unique_id[11] = device_path.value()[0];
   std::string device_id = StorageInfo::MakeDeviceId(type, unique_id);
   base::string16 storage_label = path.Append(L" Drive").LossyDisplayName();
-  *info = StorageInfo(device_id, base::string16(), path.value(), storage_label,
-                      base::string16(), base::string16(), 1000000);
+  *info = StorageInfo(device_id, path.value(), storage_label, base::string16(),
+                      base::string16(), 1000000);
 
   return true;
 }
@@ -95,11 +95,10 @@ TestVolumeMountWatcherWin::~TestVolumeMountWatcherWin() {
 void TestVolumeMountWatcherWin::AddDeviceForTesting(
     const base::FilePath& device_path,
     const std::string& device_id,
-    const base::string16& device_name,
+    const base::string16& storage_label,
     uint64 total_size_in_bytes) {
-  StorageInfo info(device_id, device_name, device_path.value(),
-                   base::string16(), base::string16(), base::string16(),
-                   total_size_in_bytes);
+  StorageInfo info(device_id, device_path.value(), storage_label,
+                   base::string16(), base::string16(), total_size_in_bytes);
   HandleDeviceAttachEventOnUIThread(device_path, info);
 }