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

chrome/browser/system_monitor/removable_device_notifications_chromeos.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.
 
 // chromeos::RemovableDeviceNotificationsCros listens for mount point changes
-// and notifies the SystemMonitor about the addition and deletion of media
+// and notifies listeners about the addition and deletion of media
 // devices.
 
 #ifndef CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_CHROMEOS_H_
 #define CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_CHROMEOS_H_
 
 #if !defined(OS_CHROMEOS)
 #error "Should only be used on ChromeOS."
 #endif
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
-#include "base/system_monitor/system_monitor.h"
 #include "chrome/browser/system_monitor/removable_storage_notifications.h"
 #include "chromeos/disks/disk_mount_manager.h"
 
 namespace chromeos {
 
 class RemovableDeviceNotificationsCros
     : public chrome::RemovableStorageNotifications,
       public base::RefCountedThreadSafe<RemovableDeviceNotificationsCros>,
       public disks::DiskMountManager::Observer {
  public:
   // Should only be called by browser start up code. Use GetInstance() instead.
   RemovableDeviceNotificationsCros();
 
   virtual void OnDiskEvent(disks::DiskMountManager::DiskEvent event,
                            const disks::DiskMountManager::Disk* disk) OVERRIDE;
   virtual void OnDeviceEvent(disks::DiskMountManager::DeviceEvent event,
                              const std::string& device_path) OVERRIDE;
   virtual void OnMountEvent(
       disks::DiskMountManager::MountEvent event,
       MountError error_code,
       const disks::DiskMountManager::MountPointInfo& mount_info) OVERRIDE;
   virtual void OnFormatEvent(disks::DiskMountManager::FormatEvent event,
                              FormatError error_code,
                              const std::string& device_path) OVERRIDE;
 
   // 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 size of the device present at |location|. If the
   // device information is unavailable, returns zero.
   virtual uint64 GetStorageSize(const std::string& location) const OVERRIDE;
 
  private:
   struct StorageObjectInfo {
     // Basic details {storage device name, location and identifier}.
-    base::SystemMonitor::RemovableStorageInfo storage_info;
+    StorageInfo storage_info;
 
     // Device storage size.
     uint64 storage_size_in_bytes;
   };
 
   friend class base::RefCountedThreadSafe<RemovableDeviceNotificationsCros>;
 
   // Mapping of mount path to removable mass storage info.
   typedef std::map<std::string, StorageObjectInfo> MountMap;
 
@@ skipping 19 matching lines @@
   // Mapping of relevant mount points and their corresponding mount devices.
   // Only accessed on the UI thread.
   MountMap mount_map_;
 
   DISALLOW_COPY_AND_ASSIGN(RemovableDeviceNotificationsCros);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_CHROMEOS_H_