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

chrome/browser/media_gallery/media_file_system_registry.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.
 
 // MediaFileSystemRegistry registers pictures directories and media devices as
 // File API filesystems and keeps track of the path to filesystem ID mappings.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_
 #define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #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)
 #include "chrome/browser/media_gallery/mtp_device_delegate_impl.h"
 #endif
 
 class Profile;
 
 namespace content {
 class RenderViewHost;
@@ skipping 21 matching lines @@
   MediaFileSystemInfo();
 
   std::string name;  // JSON string, must not contain slashes.
   FilePath path;
   std::string fsid;
 };
 
 typedef base::Callback<void(const std::vector<MediaFileSystemInfo>&)>
     MediaFileSystemsCallback;
 
-class MediaFileSystemRegistry
-    : public base::SystemMonitor::DevicesChangedObserver {
+class MediaFileSystemRegistry : public RemovableStorageObserver {
  public:
   MediaFileSystemRegistry();
   virtual ~MediaFileSystemRegistry();
 
   // Passes to |callback| the list of media filesystem IDs and paths for a
   // given RVH. Called on the UI thread.
   void GetMediaFileSystemsForExtension(
       const content::RenderViewHost* rvh,
       const extensions::Extension* extension,
       const MediaFileSystemsCallback& callback);
 
   // Returns the initialized media galleries preferences for the specified
   // |profile|. This method should be used instead of calling
   // MediaGalleriesPreferences directly because this method also ensures that
   // currently attached removable devices are added to the preferences.
   // 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;
 
   std::string GetTransientIdForDeviceId(const std::string& device_id) const;
 
   // Keys used in gallery names, which are JSON strings.
   static const char kDeviceIdKey[];
   static const char kGalleryIdKey[];
   static const char kNameKey[];
 
@@ skipping 47 matching lines @@
   scoped_ptr<MediaFileSystemContext> file_system_context_;
 
   TransientDeviceIds transient_device_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaFileSystemRegistry);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_