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

chrome/browser/system_monitor/volume_mount_watcher_win.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.
 
 #ifndef CHROME_BROWSER_SYSTEM_MONITOR_VOLUME_MOUNT_WATCHER_WIN_H_
 #define CHROME_BROWSER_SYSTEM_MONITOR_VOLUME_MOUNT_WATCHER_WIN_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/callback.h"
 #include "base/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
-#include "base/system_monitor/system_monitor.h"
 #include "base/threading/sequenced_worker_pool.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.
 class VolumeMountWatcherWin {
  public:
+  // TODO(gbillock): Take the RemovableStorageNotifications as an argument.
   VolumeMountWatcherWin();
   virtual ~VolumeMountWatcherWin();
 
   // Returns the volume file path of the drive specified by the |drive_number|.
   // |drive_number| inputs of 0 - 25 are valid. Returns an empty file path if
   // the |drive_number| is invalid.
   static FilePath DriveNumberToFilePath(int drive_number);
 
   void Init();
 
   // Gets the information about the device mounted at |device_path|. On success,
   // returns true and fills in |location|, |unique_id|, |name|, and |removable|.
   // Can block during startup while device info is still loading.
   virtual bool GetDeviceInfo(const FilePath& device_path,
                              string16* location,
                              std::string* unique_id,
                              string16* name,
                              bool* removable) const;
 
-  // 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);
 
  protected:
   struct MountPointInfo {
     std::string device_id;
     string16 location;
     std::string unique_id;
     string16 name;
     bool removable;
@@ skipping 50 matching lines @@
   MountPointDeviceMetadataMap device_metadata_;
 
   base::WeakPtrFactory<VolumeMountWatcherWin> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VolumeMountWatcherWin);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_SYSTEM_MONITOR_VOLUME_MOUNT_WATCHER_WIN_H_