[StorageMonitor] Move gallery name generation to StorageInfo.

components/storage_monitor/media_transfer_protocol_device_observer_linux.cc

 // Copyright 2014 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 "components/storage_monitor/media_transfer_protocol_device_observer_linux.h"
 
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/stl_util.h"
@@ skipping 172 matching lines @@
 
 // device::MediaTransferProtocolManager::Observer override.
 void MediaTransferProtocolDeviceObserverLinux::StorageChanged(
     bool is_attached,
     const std::string& storage_name) {
   DCHECK(!storage_name.empty());
 
   // New storage is attached.
   if (is_attached) {
     std::string device_id;
-    base::string16 device_name;
+    base::string16 storage_label;
     std::string location;
     get_storage_info_func_(storage_name, mtp_manager_,
-                           &device_id, &device_name, &location);
+                           &device_id, &storage_label, &location);
 
     // Keep track of device id and device name to see how often we receive
     // empty values.
-    MediaStorageUtil::RecordDeviceInfoHistogram(false, device_id, device_name);
-    if (device_id.empty() || device_name.empty())
+    MediaStorageUtil::RecordDeviceInfoHistogram(false, device_id,
+                                                storage_label);
+    if (device_id.empty() || storage_label.empty())
       return;
 
     DCHECK(!ContainsKey(storage_map_, location));
 
-    StorageInfo storage_info(device_id, device_name, location, device_name,
+    StorageInfo storage_info(device_id, location, storage_label,
                              base::string16(), base::string16(), 0);
     storage_map_[location] = storage_info;
     notifications_->ProcessAttach(storage_info);
   } else {
     // Existing storage is detached.
     StorageLocationToInfoMap::iterator it =
         storage_map_.find(GetDeviceLocationFromStorageName(storage_name));
     if (it == storage_map_.end())
       return;
     notifications_->ProcessDetach(it->second.device_id());
@@ skipping 17 matching lines @@
     if (it->second.device_id() == device_id) {
       *location = it->first;
       return true;
     }
   }
 
   return false;
 }
 
 }  // namespace storage_monitor