Add a method in DiskMountManager to refresh mount entries in addition to devices.

chromeos/disks/mock_disk_mount_manager.cc

 // 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.
 
 #include "chromeos/disks/mock_disk_mount_manager.h"
 
 #include <utility>
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 40 matching lines @@
   ON_CALL(*this, RemoveObserver(_))
       .WillByDefault(Invoke(this,
                             &MockDiskMountManager::RemoveObserverInternal));
   ON_CALL(*this, disks())
       .WillByDefault(Invoke(this, &MockDiskMountManager::disksInternal));
   ON_CALL(*this, mount_points())
       .WillByDefault(Invoke(this, &MockDiskMountManager::mountPointsInternal));
   ON_CALL(*this, FindDiskBySourcePath(_))
       .WillByDefault(Invoke(
           this, &MockDiskMountManager::FindDiskBySourcePathInternal));
+  ON_CALL(*this, EnsureMountInfoRefreshed(_))
+      .WillByDefault(Invoke(
+          this, &MockDiskMountManager::EnsureMountInfoRefreshedInternal));
 }
 
 MockDiskMountManager::~MockDiskMountManager() {
   STLDeleteContainerPairSecondPointers(disks_.begin(), disks_.end());
   disks_.clear();
 }
 
 void MockDiskMountManager::NotifyDeviceInsertEvents() {
   scoped_ptr<DiskMountManager::Disk> disk1(new DiskMountManager::Disk(
       std::string(kTestDevicePath),
@@ skipping 84 matching lines @@
   EXPECT_CALL(*this, AddObserver(_))
       .Times(AnyNumber());
   EXPECT_CALL(*this, RemoveObserver(_))
       .Times(AnyNumber());
   EXPECT_CALL(*this, disks())
       .WillRepeatedly(ReturnRef(disks_));
   EXPECT_CALL(*this, mount_points())
       .WillRepeatedly(ReturnRef(mount_points_));
   EXPECT_CALL(*this, FindDiskBySourcePath(_))
       .Times(AnyNumber());
-  EXPECT_CALL(*this, RequestMountInfoRefresh())
+  EXPECT_CALL(*this, EnsureMountInfoRefreshed(_))
       .Times(AnyNumber());
   EXPECT_CALL(*this, MountPath(_, _, _, _))
       .Times(AnyNumber());
   EXPECT_CALL(*this, UnmountPath(_, _, _))
       .Times(AnyNumber());
   EXPECT_CALL(*this, FormatMountedDevice(_))
       .Times(AnyNumber());
   EXPECT_CALL(*this, UnmountDeviceRecursively(_, _))
       .Times(AnyNumber());
 }
@@ skipping 51 matching lines @@
   return mount_points_;
 }
 
 const DiskMountManager::Disk*
 MockDiskMountManager::FindDiskBySourcePathInternal(
     const std::string& source_path) const {
   DiskMap::const_iterator disk_it = disks_.find(source_path);
   return disk_it == disks_.end() ? NULL : disk_it->second;
 }
 
+void MockDiskMountManager::EnsureMountInfoRefreshedInternal(
+    const EnsureMountInfoRefreshedCallback& callback) {
+  callback.Run(true);
+}
+
 void MockDiskMountManager::NotifyDiskChanged(
     DiskEvent event,
     const DiskMountManager::Disk* disk) {
   FOR_EACH_OBSERVER(Observer, observers_, OnDiskEvent(event, disk));
 }
 
 void MockDiskMountManager::NotifyDeviceChanged(DeviceEvent event,
                                                const std::string& path) {
   FOR_EACH_OBSERVER(Observer, observers_, OnDeviceEvent(event, path));
 }
 
 }  // namespace disks
 }  // namespace chromeos