Fill |model_name| and |vendor_name| fields of StorageInfo for MTP devices.

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 76 matching lines @@
       const std::string data_store_id =
           GetStorageIdFromStorageName(storage_info.storage_name());
       if (!data_store_id.empty())
         device_label += GetFormattedIdString(data_store_id);
     }
   }
   return base::UTF8ToUTF16(device_label);
 }
 
 // Helper function to get the device storage details such as device id, label
-// and location. On success and fills in |id|, |label| and |location|.
+// and location. On success and fills in |id|, |label|, |location|,
+// |vendor_name|, and |product_name|.
 void GetStorageInfo(const std::string& storage_name,
                     device::MediaTransferProtocolManager* mtp_manager,
                     std::string* id,
                     base::string16* label,
-                    std::string* location) {
+                    std::string* location,
+                    base::string16* vendor_name,
+                    base::string16* product_name) {
   DCHECK(!storage_name.empty());
   const MtpStorageInfo* storage_info =
       mtp_manager->GetStorageInfo(storage_name);
 
   if (!storage_info)
     return;
 
   *id = GetDeviceIdFromStorageInfo(*storage_info);
   *label = GetDeviceLabelFromStorageInfo(*storage_info);
   *location = GetDeviceLocationFromStorageName(storage_name);
+  *vendor_name = base::UTF8ToUTF16(storage_info->vendor());
+  *product_name = base::UTF8ToUTF16(storage_info->product());
 }
 
 }  // namespace
 
 MediaTransferProtocolDeviceObserverLinux::
 MediaTransferProtocolDeviceObserverLinux(
     StorageMonitor::Receiver* receiver,
     device::MediaTransferProtocolManager* mtp_manager)
     : mtp_manager_(mtp_manager),
       get_storage_info_func_(&GetStorageInfo),
@@ skipping 62 matching lines @@
 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 storage_label;
     std::string location;
+    base::string16 vendor_name;
+    base::string16 product_name;
     get_storage_info_func_(storage_name, mtp_manager_,
-                           &device_id, &storage_label, &location);
+                           &device_id, &storage_label, &location,
+                           &vendor_name, &product_name);
 
     // Keep track of device id and device name to see how often we receive
     // empty values.
     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, location, storage_label,
-                             base::string16(), base::string16(), 0);
+                             vendor_name, product_name, 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());
     storage_map_.erase(it);
@@ skipping 16 matching lines @@
     if (it->second.device_id() == device_id) {
       *location = it->first;
       return true;
     }
   }
 
   return false;
 }
 
 }  // namespace storage_monitor