Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/storage_monitor/test_storage_monitor.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.
 
 #include "chrome/browser/storage_monitor/test_storage_monitor.h"
 
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_impl.h"
@@ skipping 81 matching lines @@
 bool TestStorageMonitor::GetStorageInfoForPath(
     const base::FilePath& path,
     StorageInfo* device_info) const {
   DCHECK(device_info);
 
   if (!path.IsAbsolute())
     return false;
 
   std::string device_id = StorageInfo::MakeDeviceId(
       StorageInfo::FIXED_MASS_STORAGE, path.AsUTF8Unsafe());
-  *device_info =
-      StorageInfo(device_id, path.BaseName().LossyDisplayName(), path.value(),
-                  string16(), string16(), string16(), 0);
+  *device_info = StorageInfo(device_id, path.value(), base::string16(),
+                             base::string16(), base::string16(), 0);
   return true;
 }
 
 #if defined(OS_WIN)
 bool TestStorageMonitor::GetMTPStorageInfoFromDeviceId(
     const std::string& storage_device_id,
     string16* device_location,
     string16* storage_object_id) const {
   return false;
 }
@@ skipping 12 matching lines @@
 
 void TestStorageMonitor::EjectDevice(
     const std::string& device_id,
     base::Callback<void(EjectStatus)> callback) {
   ejected_device_ = device_id;
   callback.Run(EJECT_OK);
 }
 
 }  // namespace test
 }  // namespace chrome