Move chromeos_mount.cc from libcros to Chrome tree

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 53cdaf960ba12b6633ded78264bb969171aae45d..a3e1e770acaa3af019c58952cdc036bfc57a8235 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/dbus/cros_disks_client.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::CrosDisksClient::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,15 @@ 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::CrosDisksClientEventType event,
+                           const chromeos::CrosDisksClient::Disk* disk)
+      OVERRIDE;
+  virtual void DeviceChanged(chromeos::CrosDisksClientEventType event,
                              const std::string& device_path) OVERRIDE;
-  virtual void MountCompleted(chromeos::MountLibrary::MountEvent event_type,
+  virtual void MountCompleted(chromeos::CrosDisksClient::MountEvent event_type,
       chromeos::MountError error_code,
-      const chromeos::MountLibrary::MountPointInfo& mount_info) OVERRIDE;
+      const chromeos::CrosDisksClient::MountPointInfo& mount_info) OVERRIDE;
 
  private:
   typedef struct FileWatcherExtensions {
@@ -79,10 +80,10 @@ class ExtensionFileBrowserEventRouter
   };
 
   // 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::CrosDisksClient::Disk* disk);
+  void OnDiskRemoved(const chromeos::CrosDisksClient::Disk* disk);
+  void OnDiskMounted(const chromeos::CrosDisksClient::Disk* disk);
+  void OnDiskUnmounted(const chromeos::CrosDisksClient::Disk* disk);
   void OnDeviceAdded(const std::string& device_path);
   void OnDeviceRemoved(const std::string& device_path);
   void OnDeviceScanned(const std::string& device_path);
@@ -98,11 +99,12 @@ class ExtensionFileBrowserEventRouter
                                  const std::set<std::string>& extensions);
 
   // Sends filesystem changed extension message to all renderers.
-  void DispatchDiskEvent(const chromeos::MountLibrary::Disk* disk, bool added);
+  void DispatchDiskEvent(const chromeos::CrosDisksClient::Disk* disk,
+                         bool added);
 
-  void DispatchMountCompletedEvent(chromeos::MountLibrary::MountEvent event,
+  void DispatchMountCompletedEvent(chromeos::CrosDisksClient::MountEvent event,
       chromeos::MountError error_code,
-      const chromeos::MountLibrary::MountPointInfo& mount_info);
+      const chromeos::CrosDisksClient::MountPointInfo& mount_info);
 
   void RemoveBrowserFromVector(const std::string& path);