Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/storage_monitor/storage_monitor_mac.mm

 // 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/storage_monitor_mac.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 81 matching lines @@
       base::mac::GetValueFromDictionary<CFBooleanRef>(
           dict, kDADiskDescriptionMediaRemovableKey);
   bool is_removable = is_removable_ref && CFBooleanGetValue(is_removable_ref);
   // Checking for DCIM only matters on removable devices.
   bool has_dcim = is_removable && MediaStorageUtil::HasDcim(location);
   StorageInfo::Type device_type = GetDeviceType(is_removable, has_dcim);
   std::string device_id;
   if (!unique_id.empty())
     device_id = StorageInfo::MakeDeviceId(device_type, unique_id);
 
-  return StorageInfo(device_id, string16(), location.value(), label, vendor,
-                     model, size_in_bytes);
+  return StorageInfo(device_id, location.value(), label, vendor, model,
+                     size_in_bytes);
 }
 
 void GetDiskInfoAndUpdateOnFileThread(
     const base::WeakPtr<StorageMonitorMac>& monitor,
     base::ScopedCFTypeRef<CFDictionaryRef> dict,
     StorageMonitorMac::UpdateType update_type) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
 
   std::string bsd_name;
   StorageInfo info = BuildStorageInfo(dict, &bsd_name);
@@ skipping 253 matching lines @@
     }
   }
   return false;
 }
 
 StorageMonitor* StorageMonitor::Create() {
   return new StorageMonitorMac();
 }
 
 }  // namespace chrome