Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/storage_monitor/test_volume_mount_watcher_win.cc

 // Copyright (c) 2013 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.
 //
 // TestVolumeMountWatcherWin implementation.
 
 #include "chrome/browser/storage_monitor/test_volume_mount_watcher_win.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 59 matching lines @@
   if (path.value() != ASCIIToUTF16("N:\\") &&
       path.value() != ASCIIToUTF16("C:\\") &&
       path.value() != GetTempRoot().value()) {
     type = StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM;
   }
   std::string unique_id =
       "\\\\?\\Volume{00000000-0000-0000-0000-000000000000}\\";
   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;
 }
 
 }  // namespace
 
 // TestVolumeMountWatcherWin ---------------------------------------------------
 
 TestVolumeMountWatcherWin::TestVolumeMountWatcherWin()
     : attached_devices_fake_(false) {}
 
 TestVolumeMountWatcherWin::~TestVolumeMountWatcherWin() {
 }
 
 void TestVolumeMountWatcherWin::AddDeviceForTesting(
     const base::FilePath& device_path,
     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);
 }
 
 void TestVolumeMountWatcherWin::SetAttachedDevicesFake() {
   attached_devices_fake_ = true;
 }
 
 void TestVolumeMountWatcherWin::FlushWorkerPoolForTesting() {
   device_info_worker_pool_->FlushForTesting();
 }
@@ skipping 36 matching lines @@
     return base::Bind(&FakeGetAttachedDevices);
   return base::Bind(&FakeGetSingleAttachedDevice);
 }
 
 void TestVolumeMountWatcherWin::ShutdownWorkerPool() {
   device_info_worker_pool_->Shutdown();
 }
 
 }  // namespace test
 }  // namespace chrome