Retry: [CrOS] Enumerate existing mount points and check for media devices.

chrome/browser/chromeos/disks/mock_disk_mount_manager.cc

Index: chrome/browser/chromeos/disks/mock_disk_mount_manager.cc
diff --git a/chrome/browser/chromeos/disks/mock_disk_mount_manager.cc b/chrome/browser/chromeos/disks/mock_disk_mount_manager.cc
index 5ebbf4f008e4155fcc3f44c877600cb736a62f1d..38909657826ee68caf25758e787c844d03f82fc9 100644
--- a/chrome/browser/chromeos/disks/mock_disk_mount_manager.cc
+++ b/chrome/browser/chromeos/disks/mock_disk_mount_manager.cc
@@ -51,6 +51,8 @@ MockDiskMountManager::MockDiskMountManager() {
                             &MockDiskMountManager::RemoveObserverInternal));
   ON_CALL(*this, disks())
       .WillByDefault(Invoke(this, &MockDiskMountManager::disksInternal));
+  ON_CALL(*this, mount_points())
+      .WillByDefault(Invoke(this, &MockDiskMountManager::mountPointsInternal));
 }
 
 MockDiskMountManager::~MockDiskMountManager() {
@@ -143,6 +145,8 @@ void MockDiskMountManager::SetupDefaultReplies() {
       .Times(AnyNumber());
   EXPECT_CALL(*this, disks())
       .WillRepeatedly(ReturnRef(disks_));
+  EXPECT_CALL(*this, mount_points())
+      .WillRepeatedly(ReturnRef(mount_points_));
   EXPECT_CALL(*this, RequestMountInfoRefresh())
       .Times(AnyNumber());
   EXPECT_CALL(*this, MountPath(_, _, _, _))
@@ -193,6 +197,11 @@ void MockDiskMountManager::RemoveDiskEntryForMountDevice(
   }
 }
 
+const DiskMountManager::MountPointMap&
+MockDiskMountManager::mountPointsInternal() const {
+  return mount_points_;
+}
+
 void MockDiskMountManager::NotifyDiskChanged(
     DiskMountManagerEventType event,
     const DiskMountManager::Disk* disk) {