Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc

Index: chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc
===================================================================
--- chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc	(revision 218837)
+++ chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc	(working copy)
@@ -77,7 +77,7 @@
   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,
+  *info = StorageInfo(device_id, path.value(), storage_label,
                       base::string16(), base::string16(), 1000000);
 
   return true;
@@ -98,9 +98,8 @@
     const std::string& device_id,
     const base::string16& device_name,
     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(), device_name,
+                   base::string16(), base::string16(), total_size_in_bytes);
   HandleDeviceAttachEventOnUIThread(device_path, info);
 }