[StorageMonitor] Move gallery name generation to StorageInfo.

chrome/browser/storage_monitor/storage_info.h

Index: chrome/browser/storage_monitor/storage_info.h
diff --git a/chrome/browser/storage_monitor/storage_info.h b/chrome/browser/storage_monitor/storage_info.h
index f36cc28c29a3df6c4c16ebac36c52e97f34989ab..60a2d02d053c05ba8eaac025d9527d5a00f247aa 100644
--- a/chrome/browser/storage_monitor/storage_info.h
+++ b/chrome/browser/storage_monitor/storage_info.h
@@ -68,6 +68,8 @@ struct StorageInfo {
 
   static bool IsIPhotoDevice(const std::string& device_id);
 
+  base::string16 GetDisplayName() const;
+
   const std::string& device_id() const { return device_id_; }
   const base::string16& name() const { return name_; }
   const base::FilePath::StringType& location() const { return location_; }
@@ -78,9 +80,21 @@ struct StorageInfo {
 
   void set_device_id(const std::string& device_id) { device_id_ = device_id; }
   void set_name(const base::string16& name) { name_ = name; }
+  void set_storage_label(const base::string16& storage_label) {

[vandebo (ex-Chrome), 2014/01/08 19:46:25]

Remove these new setters. The other setters should go away too, but that can be
done in a different CL.

+    storage_label_ = storage_label;
+  }
+  void set_vendor_name(const base::string16& vendor_name) {
+    vendor_name_ = vendor_name;
+  }
+  void set_model_name(const base::string16& model_name) {
+    model_name_ = model_name;
+  }
   void set_location(const base::FilePath::StringType& location) {
     location_ = location;
   }
+  void set_total_size_in_bytes(uint64 total_size_in_bytes) {
+    total_size_in_bytes_ = total_size_in_bytes;
+  }
 
  private:
   // Unique device id - persists between device attachments.