Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/storage_monitor/volume_mount_watcher_win.cc

 // Copyright (c) 2012 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 "chrome/browser/storage_monitor/volume_mount_watcher_win.h"
 
 #include <windows.h>
 
 #include <dbt.h>
 #include <fileapi.h>
@@ skipping 155 matching lines @@
   base::string16 volume_label;
   GetVolumeInformationW(device_path.value().c_str(),
                         WriteInto(&volume_label, kMaxPathBufLen),
                         kMaxPathBufLen, NULL, NULL, NULL, NULL, 0);
 
   uint64 total_size_in_bytes = GetVolumeSize(mount_point);
   std::string device_id = StorageInfo::MakeDeviceId(type, UTF16ToUTF8(guid));
 
   // TODO(gbillock): if volume_label.empty(), get the vendor/model information
   // for the volume.
-  *info = StorageInfo(device_id, base::string16(), mount_point,
-                      volume_label, base::string16(), base::string16(),
-                      total_size_in_bytes);
+  *info = StorageInfo(device_id, mount_point, volume_label, base::string16(),
+                      base::string16(), total_size_in_bytes);
   return true;
 }
 
 // Returns a vector of all the removable mass storage devices that are
 // connected.
 std::vector<base::FilePath> GetAttachedDevices() {
   std::vector<base::FilePath> result;
   base::string16 volume_name;
   HANDLE find_handle = FindFirstVolume(WriteInto(&volume_name, kMaxPathBufLen),
                                        kMaxPathBufLen);
@@ skipping 333 matching lines @@
     callback.Run(StorageMonitor::EJECT_FAILURE);
     return;
   }
 
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&EjectDeviceInThreadPool, device, callback, task_runner_, 0));
 }
 
 }  // namespace chrome