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

components/storage_monitor/media_transfer_protocol_device_observer_linux.h

 // 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.
 
 #ifndef COMPONENTS_STORAGE_MONITOR_MEDIA_TRANSFER_PROTOCOL_DEVICE_OBSERVER_LINUX_H_
 #define COMPONENTS_STORAGE_MONITOR_MEDIA_TRANSFER_PROTOCOL_DEVICE_OBSERVER_LINUX_H_
 
 #include <map>
 #include <string>
 
 #include "base/strings/string16.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace storage_monitor {
 
 // Gets the mtp device information given a |storage_name|. On success,
-// fills in |id|, |name| and |location|.
+// fills in |id|, |name|, |location|, |vendor_name|, and |product_name|.
 typedef void (*GetStorageInfoFunc)(
     const std::string& storage_name,
     device::MediaTransferProtocolManager* mtp_manager,
     std::string* id,
     base::string16* name,
-    std::string* location);
+    std::string* location,
+    base::string16* vendor_name,
+    base::string16* product_name);
 
 // Helper class to send MTP storage attachment and detachment events to
 // StorageMonitor.
 class MediaTransferProtocolDeviceObserverLinux
     : public device::MediaTransferProtocolManager::Observer {
  public:
   MediaTransferProtocolDeviceObserverLinux(
       StorageMonitor::Receiver* receiver,
       device::MediaTransferProtocolManager* mtp_manager);
   virtual ~MediaTransferProtocolDeviceObserverLinux();
@@ skipping 44 matching lines @@
   // The notifications object to use to signal newly attached devices.
   // Guaranteed to outlive this class.
   StorageMonitor::Receiver* const notifications_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaTransferProtocolDeviceObserverLinux);
 };
 
 }  // namespace storage_monitor
 
 #endif  // COMPONENTS_STORAGE_MONITOR_MEDIA_TRANSFER_PROTOCOL_DEVICE_OBSERVER_LINUX_H_