Make the Linux System Monitor implementation track all devices

chrome/browser/media_gallery/disk_mount_watcher_linux.h

Index: chrome/browser/media_gallery/disk_mount_watcher_linux.h
diff --git a/chrome/browser/media_gallery/disk_mount_watcher_linux.h b/chrome/browser/media_gallery/disk_mount_watcher_linux.h
new file mode 100644
index 0000000000000000000000000000000000000000..688d36618f6345dfd24686e334ced10dbc959c09
--- /dev/null
+++ b/chrome/browser/media_gallery/disk_mount_watcher_linux.h
@@ -0,0 +1,142 @@
+// 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.
+
+// DiskMountWatcherLinux listens for mount point changes, notifies the
+// SystemMonitor about the addition and deletion of media devices, and
+// answers queries about mounted devices.
+
+#ifndef CHROME_BROWSER_MEDIA_GALLERY_DISK_MOUNT_WATCHER_LINUX_H_
+#define CHROME_BROWSER_MEDIA_GALLERY_DISK_MOUNT_WATCHER_LINUX_H_
+
+#if defined(OS_CHROMEOS)
+#error "See cromeos::DiskMountManager and cromeos::MediaDeviceNotifications."
+#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 "content/public/browser/browser_thread.h"
+
+class FilePath;
+
+// Gets the media device information given a |device_path|. On success,
+// returns true and fills in |device_name| and |unique_id|.
+typedef bool (*GetDeviceInfoFunc)(const FilePath& device_path,
+                                  std::string* unique_id, string16* name,
+                                  bool* usb);
+
+namespace chrome {
+
+class DiskMountWatcherLinux
+    : public base::RefCountedThreadSafe<DiskMountWatcherLinux,
+          content::BrowserThread::DeleteOnFileThread> {
+ public:
+  // Should only be called by browser start up code.  Use GetInstance() instead.
+  explicit DiskMountWatcherLinux(const FilePath& path);
+
+  static DiskMountWatcherLinux* GetInstance();
+
+  // Must be called for DiskMountWatcherLinux to work.
+  void Init();
+
+  // Use |unique_id| to find and return where the device is mounted.
+  FilePath GetDeviceMountPoint(const std::string& device_id) const;
+
+  // Determines which device |path| is located on and returns the unique id
+  // for that device.  If |mount_point| is not NULL, set it to the mount point
+  // of the device.
+  std::string GetDeviceIdForPath(const FilePath& path,
+                                 FilePath* mount_point) const;
+
+ protected:
+  // Only for use in unit tests.
+  DiskMountWatcherLinux(const FilePath& path, GetDeviceInfoFunc getDeviceInfo);
+
+  // 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 ~DiskMountWatcherLinux();
+
+  virtual void OnFilePathChanged(const FilePath& path, bool error);
+
+ private:
+  friend class base::RefCountedThreadSafe<DiskMountWatcherLinux>;
+  friend class base::DeleteHelper<DiskMountWatcherLinux>;
+  friend struct content::BrowserThread::DeleteOnThread<
+      content::BrowserThread::FILE>;
+
+  // Structure to save mounted device information such as device path and unique
+  // identifier.
+  struct MountPointInfo {
+    FilePath mount_device;
+    std::string device_id;
+    string16 device_name;
+    bool has_dcim;
+  };
+
+  // Mapping of mount points to MountPointInfo.
+  typedef std::map<FilePath, MountPointInfo> MountMap;
+
+  // (mount point, priority)
+  // For devices that are mounted to multiple mount points, this helps us track
+  // which one we've notified system monitor about.
+  typedef std::map<FilePath, bool> ReferencedMountPoint;
+
+  // (mount device, map of known mount points)
+  // For each mount device, track the places it is mounted and which one (if
+  // any) we have notified system monitor about.
+  typedef std::map<FilePath, ReferencedMountPoint> MountPriorityMap;
+
+  void InitOnFileThread();
+
+  // Parses mtab file and find all changes.
+  void UpdateMtab();
+
+  // Adds |mount_device| as mounted on |mount_point|.  If the deice is a new
+  // media // device, SystemMonitor is notified.
+  void AddNewMount(const FilePath& mount_device, const FilePath& mount_point);
+
+  // Removes media device with a given device id.
+  void RemoveMediaMount(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_;
+
+  // Set of known file systems that we care about.
+  std::set<std::string> known_file_systems_;
+
+  // Function handler to get device information. This is useful to set a mock
+  // handler for unit testing.
+  GetDeviceInfoFunc get_device_info_func_;
+
+  // 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 mount_info_map_;
+
+  // Because a device can be mounted to multiple places, we only want to
+  // notify about one of them. If (and only if) that one is unmounted, we need
+  // to notify about it's departure and notify about another one of it's mount
+  // points.
+  MountPriorityMap mount_priority_map_;
+
+  DISALLOW_COPY_AND_ASSIGN(DiskMountWatcherLinux);
+};
+
+}  // namespace chrome
+
+#endif  // CHROME_BROWSER_MEDIA_GALLERY_DISK_MOUNT_WATCHER_LINUX_H_