Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/storage_monitor/storage_monitor_chromeos.cc

Index: chrome/browser/storage_monitor/storage_monitor_chromeos.cc
===================================================================
--- chrome/browser/storage_monitor/storage_monitor_chromeos.cc	(revision 218837)
+++ chrome/browser/storage_monitor/storage_monitor_chromeos.cc	(working copy)
@@ -70,11 +70,10 @@
 
   *info = chrome::StorageInfo(
       chrome::StorageInfo::MakeDeviceId(type, unique_id),
-      string16(),
       mount_info.mount_path,
       device_label,
-      UTF8ToUTF16(disk->vendor_name()),
-      UTF8ToUTF16(disk->product_name()),
+      base::UTF8ToUTF16(disk->vendor_name()),
+      base::UTF8ToUTF16(disk->product_name()),
       disk->total_size_in_bytes());
   return true;
 }
@@ -90,7 +89,6 @@
 }  // namespace
 
 using content::BrowserThread;
-using chrome::StorageInfo;
 
 StorageMonitorCros::StorageMonitorCros()
     : weak_ptr_factory_(this) {
@@ -208,7 +206,7 @@
 
 bool StorageMonitorCros::GetStorageInfoForPath(
     const base::FilePath& path,
-    StorageInfo* device_info) const {
+    chrome::StorageInfo* device_info) const {
   DCHECK(device_info);
 
   if (media_transfer_protocol_device_observer_->GetStorageInfoForPath(