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

chrome/browser/media_gallery/media_file_system_registry.h

Index: chrome/browser/media_gallery/media_file_system_registry.h
diff --git a/chrome/browser/media_gallery/media_file_system_registry.h b/chrome/browser/media_gallery/media_file_system_registry.h
index 024d28e96b7df7318782e83c0b7a866b76a08b3c..d8d155affe58b66a4fd9e4058bab07379ef8f3c4 100644
--- a/chrome/browser/media_gallery/media_file_system_registry.h
+++ b/chrome/browser/media_gallery/media_file_system_registry.h
@@ -17,8 +17,8 @@
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/public/pref_change_registrar.h"
-#include "base/system_monitor/system_monitor.h"
 #include "chrome/browser/media_gallery/transient_device_ids.h"
+#include "chrome/browser/system_monitor/removable_storage_observer.h"
 #include "webkit/fileapi/media/mtp_device_file_system_config.h"
 
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
@@ -60,8 +60,7 @@ struct MediaFileSystemInfo {
 typedef base::Callback<void(const std::vector<MediaFileSystemInfo>&)>
     MediaFileSystemsCallback;
 
-class MediaFileSystemRegistry
-    : public base::SystemMonitor::DevicesChangedObserver {
+class MediaFileSystemRegistry : public RemovableStorageObserver {
  public:
   MediaFileSystemRegistry();
   virtual ~MediaFileSystemRegistry();
@@ -80,12 +79,11 @@ class MediaFileSystemRegistry
   // Called on the UI thread.
   MediaGalleriesPreferences* GetPreferences(Profile* profile);
 
-  // base::SystemMonitor::DevicesChangedObserver implementation.
+  // RemovableStorageObserver implementation.
   virtual void OnRemovableStorageAttached(
-      const std::string& id,
-      const string16& name,
-      const FilePath::StringType& location) OVERRIDE;
-  virtual void OnRemovableStorageDetached(const std::string& id) OVERRIDE;
+      const RemovableStorageNotifications::StorageInfo& info) OVERRIDE;
+  virtual void OnRemovableStorageDetached(
+      const RemovableStorageNotifications::StorageInfo& info) OVERRIDE;
 
   size_t GetExtensionHostCountForTests() const;