Rewritten MountLibrary to work with non-blocking mount API calls in libcros....

chrome/browser/chromeos/cros/mock_mount_library.h

Index: chrome/browser/chromeos/cros/mock_mount_library.h
===================================================================
--- chrome/browser/chromeos/cros/mock_mount_library.h	(revision 78562)
+++ chrome/browser/chromeos/cros/mock_mount_library.h	(working copy)
@@ -23,26 +23,31 @@
   virtual ~MockMountLibrary();
 
   MOCK_METHOD1(AddObserver, void(MountLibrary::Observer*));
-  MOCK_METHOD1(MountPath, bool(const char*));
   MOCK_METHOD1(RemoveObserver, void(MountLibrary::Observer*));
-  MOCK_CONST_METHOD0(disks, const MountLibrary::DiskVector&(void));
+  MOCK_CONST_METHOD0(disks, const MountLibrary::DiskMap&(void));
 
+  MOCK_METHOD0(RequestMountInfoRefresh, void(void));
+  MOCK_METHOD1(MountPath, void(const char*));
+  MOCK_METHOD1(UnmountPath, void(const char*));
+
   void FireDeviceInsertEvents();
   void FireDeviceRemoveEvents();
 
  private:
   void AddObserverInternal(MountLibrary::Observer* observer);
   void RemoveObserverInternal(MountLibrary::Observer* observer);
-  const MountLibrary::DiskVector& disksInternal() const { return disks_; }
+  const MountLibrary::DiskMap& disksInternal() const { return disks_; }
 
 
-  void UpdateMountStatus(MountEventType evt,
-                         const std::string& path);
+  void UpdateDeviceChanged(MountLibraryEventType evt,
+                           const std::string& path);
+  void UpdateDiskChanged(MountLibraryEventType evt,
+                         const MountLibrary::Disk* disk);
 
   ObserverList<MountLibrary::Observer> observers_;
 
   // The list of disks found.
-  MountLibrary::DiskVector disks_;
+  MountLibrary::DiskMap disks_;
 
   DISALLOW_COPY_AND_ASSIGN(MockMountLibrary);
 };