[Media Galleries] Move RemovableStorageInfo notifications to chrome namespace (part 2)

chrome/browser/system_monitor/volume_mount_watcher_win.h

Index: chrome/browser/system_monitor/volume_mount_watcher_win.h
diff --git a/chrome/browser/system_monitor/volume_mount_watcher_win.h b/chrome/browser/system_monitor/volume_mount_watcher_win.h
index 0dadca7111e09bab7f05008bdcc32369b85bbec3..7b38ba2495d435b21ebad3d8f31cec30352c53ff 100644
--- a/chrome/browser/system_monitor/volume_mount_watcher_win.h
+++ b/chrome/browser/system_monitor/volume_mount_watcher_win.h
@@ -13,16 +13,17 @@
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
-#include "base/system_monitor/system_monitor.h"
 
 namespace chrome {
 
 // This class watches the volume mount points and sends notifications to
-// base::SystemMonitor about the device attach/detach events. This is a
-// singleton class instantiated by RemovableDeviceNotificationsWindowWin.
+// RemovableStorageNotifications about the device attach/detach events.
+// This is a singleton class instantiated by
+// RemovableDeviceNotificationsWindowWin.
 class VolumeMountWatcherWin
     : public base::RefCountedThreadSafe<VolumeMountWatcherWin> {
  public:
+  // TODO(gbillock): Take the RemovableStorageNotifications as an argument.

[vandebo (ex-Chrome), 2013/01/18 18:42:58]

This is so that you could call ProcessAttach/Detach ?  I don't think that will
work.  I think you need to take an inner class of
RemovableDeviceNotificationsWindowWin that makes that functionality available
here and to PortableDeviceWatcherWin.  The TODO is fine as long as we agree on
what it really means.

[Greg Billock, 2013/01/22 20:00:39]

Yes, that's the goal -- basically the platform-specific impl should expose some
kind of interface it needs to relate to its tooling classes. The main thing is
to make the ownership tree simple and reduce (ideally to zero) singleton
references.

   VolumeMountWatcherWin();
 
   // Must be called after the file thread is created.
@@ -36,7 +37,7 @@ class VolumeMountWatcherWin
                              string16* name,
                              bool* removable);
 
-  // Processes DEV_BROADCAST_VOLUME messages and triggers a SystemMonitor
+  // Processes DEV_BROADCAST_VOLUME messages and triggers a
   // notification if appropriate.
   void OnWindowMessage(UINT event_type, LPARAM data);