[LINUX] Extract the name and id of the device and send it along the device attach message.

chrome/browser/media_gallery/media_device_notifications_linux.h

 // 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.
 
 // MediaDeviceNotificationsLinux listens for mount point changes and notifies
 // the SystemMonitor about the addition and deletion of media devices.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_LINUX_H_
 #define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_LINUX_H_
 
 #if defined(OS_CHROMEOS)
 #error "Use the ChromeOS-specific implementation instead."
 #endif
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path_watcher.h"
 #include "base/memory/ref_counted.h"
+#include "base/system_monitor/system_monitor.h"
 #include "content/public/browser/browser_thread.h"
 
 class FilePath;
 
+typedef bool (*GetDeviceInfoFunc)(
+    const std::string& device_path,
+    base::SystemMonitor::MediaDeviceType media_device_type,
+    std::string* device_name,
+    string16* device_id);
+
 namespace chrome {
 
 class MediaDeviceNotificationsLinux
     : public base::RefCountedThreadSafe<MediaDeviceNotificationsLinux,
           content::BrowserThread::DeleteOnFileThread> {
  public:
   explicit MediaDeviceNotificationsLinux(const FilePath& path);
 
+  // Only for use in unit tests.
+  MediaDeviceNotificationsLinux(const FilePath& path,

[Lei Zhang, 2012/08/10 10:26:33]

protected?

[kmadhusu, 2012/08/10 19:41:01]

Done.

+                                GetDeviceInfoFunc getDeviceInfo);
+
   // Must be called for MediaDeviceNotificationsLinux to work.
   void Init();
 
  protected:
   // Avoids code deleting the object while there are references to it.
   // Aside from the base::RefCountedThreadSafe friend class, and derived
   // classes, any attempts to call this dtor will result in a compile-time
   // error.
   virtual ~MediaDeviceNotificationsLinux();
 
   virtual void OnFilePathChanged(const FilePath& path, bool error);
 
  private:
   friend class base::RefCountedThreadSafe<MediaDeviceNotificationsLinux>;
   friend class base::DeleteHelper<MediaDeviceNotificationsLinux>;
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::FILE>;
 
-  // (mount device, device id)
-  typedef std::pair<std::string, std::string> MountDeviceAndId;
+  struct MountDeviceAndId {
+    MountDeviceAndId(const std::string& mount_device, const std::string& id)
+        : mount_device(mount_device),

[Lei Zhang, 2012/08/10 10:26:33]

nit: name the parameter can just be "device" so this line looks less confusing.

[kmadhusu, 2012/08/10 19:41:01]

Done.

+          device_unique_id(id) {
+    }
+
+    // Mounted device path.
+    std::string mount_device;
+
+    // Device unique id.
+    std::string device_unique_id;

[vandebo (ex-Chrome), 2012/08/10 00:32:58]

nit: device_id is probably sufficient

[kmadhusu, 2012/08/10 19:41:01]

Done.

+  };
+
   // Mapping of mount points to MountDeviceAndId.
   typedef std::map<std::string, MountDeviceAndId> MountMap;
 
+  // (mount point, mount device)
+  // Helper map to get new entries from mtab file.
+  typedef std::map<std::string, std::string> MountPointDeviceMap;
+
+  // Update |known_file_systems_| based on known file system information.
+  void PopulateKnownFileSystemsInfo();
+
   void InitOnFileThread();
 
   // Parse the mtab file and find all changes.
   void UpdateMtab();
 
   // Read the mtab file entries into |mtab|.
-  void ReadMtab(MountMap* mtab);
+  void ReadMtab(MountPointDeviceMap* mtab);
 
-  // Add a media device with a given device and mount device. Assign it a device
-  // id as well.
-  void AddNewDevice(const std::string& mount_device,
-                    const std::string& mount_point,
-                    std::string* device_id);
+  // Check and add |mount_device| as media device given the |mount_point|.
+  void CheckAndAddMediaDevice(const std::string& mount_device,
+                              const std::string& mount_point);
 
   // Remove a media device with a given device id.
   void RemoveOldDevice(const std::string& device_id);
 
   // Whether Init() has been called or not.
   bool initialized_;
 
   // Mtab file that lists the mount points.
   const FilePath mtab_path_;
 
   // Watcher for |mtab_path_|.
   base::files::FilePathWatcher file_watcher_;
 
   // Mapping of relevant mount points and their corresponding mount devices.
   // Keep in mind on Linux, a device can be mounted at multiple mount points,
   // and multiple devices can be mounted at a mount point.
-  MountMap mtab_;
-
-  // The lowest available device id number.
-  // TODO(thestig) Remove this and use a real per-device unique id instead.
-  int current_device_id_;
+  MountMap mount_info_map_;
 
   // Set of known file systems that we care about.
   std::set<std::string> known_file_systems_;
 
+  GetDeviceInfoFunc get_device_info_func_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaDeviceNotificationsLinux);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_LINUX_H_