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

chrome/browser/system_monitor/removable_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.
 
 // RemovableDeviceNotificationsLinux listens for mount point changes, notifies
-// the SystemMonitor about the addition and deletion of media devices, and
+// listeners about the addition and deletion of media devices, and
 // answers queries about mounted devices.
 
 #ifndef CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_LINUX_H_
 #define CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_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 "chrome/browser/system_monitor/removable_storage_notifications.h"
 #include "content/public/browser/browser_thread.h"
 
 class FilePath;
 
 // Gets device information given a |device_path|. On success, fills in
 // |unique_id|, |name|, |removable| and |partition_size_in_bytes|.
 typedef void (*GetDeviceInfoFunc)(const FilePath& device_path,
                                   std::string* unique_id,
                                   string16* name,
@@ skipping 10 matching lines @@
   // Should only be called by browser start up code.  Use GetInstance() instead.
   explicit RemovableDeviceNotificationsLinux(const FilePath& path);
 
   // Must be called for RemovableDeviceNotificationsLinux to work.
   void Init();
 
   // Finds the device that contains |path| and populates |device_info|.
   // Returns false if unable to find the device.
   virtual bool GetDeviceInfoForPath(
       const FilePath& path,
-      base::SystemMonitor::RemovableStorageInfo* device_info) const OVERRIDE;
+      StorageInfo* device_info) const OVERRIDE;
 
   // Returns the storage partition size of the device present at |location|.
   // If the requested information is unavailable, returns 0.
   virtual uint64 GetStorageSize(const std::string& location) const OVERRIDE;
 
  protected:
   // Only for use in unit tests.
   RemovableDeviceNotificationsLinux(const FilePath& path,
                                     GetDeviceInfoFunc getDeviceInfo);
 
@@ skipping 35 matching lines @@
   // any) we have notified system monitor about.
   typedef std::map<FilePath, ReferencedMountPoint> MountPriorityMap;
 
   // Do initialization on the File Thread.
   void InitOnFileThread();
 
   // Parses mtab file and find all changes.
   void UpdateMtab();
 
   // Adds |mount_device| as mounted on |mount_point|.  If the device is a new
-  // device SystemMonitor is notified.
+  // device any listeners are notified.
   void AddNewMount(const FilePath& mount_device, const FilePath& mount_point);
 
   // 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::FilePathWatcher file_watcher_;
@@ skipping 15 matching lines @@
   // to notify about it's departure and notify about another one of it's mount
   // points.
   MountPriorityMap mount_priority_map_;
 
   DISALLOW_COPY_AND_ASSIGN(RemovableDeviceNotificationsLinux);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_LINUX_H_