Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/storage_monitor/storage_monitor_chromeos.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.
 
 // chromeos::StorageMonitorCros implementation.
 
 #include "chrome/browser/storage_monitor/storage_monitor_chromeos.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 52 matching lines @@
                                                       device_label);
   if (unique_id.empty())
     return false;
 
   chrome::StorageInfo::Type type = has_dcim ?
       chrome::StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM :
       chrome::StorageInfo::REMOVABLE_MASS_STORAGE_NO_DCIM;
 
   *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;
 }
 
 // Returns whether the mount point in |mount_info| is a media device or not.
 bool CheckMountedPathOnFileThread(
     const disks::DiskMountManager::MountPointInfo& mount_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   return chrome::MediaStorageUtil::HasDcim(
       base::FilePath(mount_info.mount_path));
 }
 
 }  // namespace
 
 using content::BrowserThread;
-using chrome::StorageInfo;
 
 StorageMonitorCros::StorageMonitorCros()
     : weak_ptr_factory_(this) {
 }
 
 StorageMonitorCros::~StorageMonitorCros() {
   disks::DiskMountManager* manager = disks::DiskMountManager::GetInstance();
   if (manager) {
     manager->RemoveObserver(this);
   }
@@ skipping 97 matching lines @@
 
 void StorageMonitorCros::SetMediaTransferProtocolManagerForTest(
     device::MediaTransferProtocolManager* test_manager) {
   DCHECK(!media_transfer_protocol_manager_);
   media_transfer_protocol_manager_.reset(test_manager);
 }
 
 
 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(
           path, device_info)) {
     return true;
   }
 
   if (!path.IsAbsolute())
     return false;
 
@@ skipping 78 matching lines @@
 
 }  // namespace chromeos
 
 namespace chrome {
 
 StorageMonitor* StorageMonitor::Create() {
   return new chromeos::StorageMonitorCros();
 }
 
 }  // namespace chrome