Switch from MountLibrary to CrosDisksLibrary

chrome/browser/chromeos/extensions/file_browser_event_router.h

Index: chrome/browser/chromeos/extensions/file_browser_event_router.h
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.h b/chrome/browser/chromeos/extensions/file_browser_event_router.h
index b9d2b231564a9fa3572c52c2ca53bf0f0380efdb..e54645572a712355435c4b183210c97110b58189 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.h
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.h
@@ -15,7 +15,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/synchronization/lock.h"
-#include "chrome/browser/chromeos/cros/mount_library.h"
+#include "chrome/browser/chromeos/disks/disk_mount_manager.h"
 
 class FileBrowserNotifications;
 class Profile;
@@ -23,12 +23,12 @@ class Profile;
 // Used to monitor disk mount changes and signal when new mounted usb device is
 // found.
 class ExtensionFileBrowserEventRouter
-    : public chromeos::MountLibrary::Observer {
+    : public chromeos::disks::DiskMountManager::Observer {
  public:
   explicit ExtensionFileBrowserEventRouter(Profile* profile);
   virtual ~ExtensionFileBrowserEventRouter();
   // Starts observing file system change events. Currently only
-  // MountLibrary events are being observed.
+  // CrosDisksClient events are being observed.
   void ObserveFileSystemEvents();
 
   // File watch setup routines.
@@ -38,14 +38,17 @@ class ExtensionFileBrowserEventRouter
   void RemoveFileWatch(const FilePath& file_path,
                        const std::string& extension_id);
 
-  // MountLibrary::Observer overrides.
-  virtual void DiskChanged(chromeos::MountLibraryEventType event,
-                           const chromeos::MountLibrary::Disk* disk) OVERRIDE;
-  virtual void DeviceChanged(chromeos::MountLibraryEventType event,
+  // CrosDisksClient::Observer overrides.
+  virtual void DiskChanged(chromeos::disks::DiskMountManagerEventType event,
+                           const chromeos::disks::DiskMountManager::Disk* disk)
+      OVERRIDE;
+  virtual void DeviceChanged(chromeos::disks::DiskMountManagerEventType event,
                              const std::string& device_path) OVERRIDE;
-  virtual void MountCompleted(chromeos::MountLibrary::MountEvent event_type,
+  virtual void MountCompleted(
+      chromeos::disks::DiskMountManager::MountEvent event_type,
       chromeos::MountError error_code,
-      const chromeos::MountLibrary::MountPointInfo& mount_info) OVERRIDE;
+      const chromeos::disks::DiskMountManager::MountPointInfo& mount_info)
+      OVERRIDE;
 
  private:
   // Helper class for passing through file watch notification events.
@@ -95,10 +98,10 @@ class ExtensionFileBrowserEventRouter
   typedef std::map<FilePath, FileWatcherExtensions*> WatcherMap;
 
   // USB mount event handlers.
-  void OnDiskAdded(const chromeos::MountLibrary::Disk* disk);
-  void OnDiskRemoved(const chromeos::MountLibrary::Disk* disk);
-  void OnDiskMounted(const chromeos::MountLibrary::Disk* disk);
-  void OnDiskUnmounted(const chromeos::MountLibrary::Disk* disk);
+  void OnDiskAdded(const chromeos::disks::DiskMountManager::Disk* disk);
+  void OnDiskRemoved(const chromeos::disks::DiskMountManager::Disk* disk);
+  void OnDiskMounted(const chromeos::disks::DiskMountManager::Disk* disk);
+  void OnDiskUnmounted(const chromeos::disks::DiskMountManager::Disk* disk);
   void OnDeviceAdded(const std::string& device_path);
   void OnDeviceRemoved(const std::string& device_path);
   void OnDeviceScanned(const std::string& device_path);
@@ -114,11 +117,13 @@ class ExtensionFileBrowserEventRouter
                                  const ExtensionUsageRegistry& extensions);
 
   // Sends filesystem changed extension message to all renderers.
-  void DispatchDiskEvent(const chromeos::MountLibrary::Disk* disk, bool added);
+  void DispatchDiskEvent(const chromeos::disks::DiskMountManager::Disk* disk,
+                         bool added);
 
-  void DispatchMountCompletedEvent(chromeos::MountLibrary::MountEvent event,
+  void DispatchMountCompletedEvent(
+      chromeos::disks::DiskMountManager::MountEvent event,
       chromeos::MountError error_code,
-      const chromeos::MountLibrary::MountPointInfo& mount_info);
+      const chromeos::disks::DiskMountManager::MountPointInfo& mount_info);
 
   void RemoveBrowserFromVector(const std::string& path);