Small refactoring in DiskMountManager (event reporting; format method).

chromeos/disks/mock_disk_mount_manager.h

 // 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.
 
 #ifndef CHROMEOS_DISKS_MOCK_DISK_MOUNT_MANAGER_H_
 #define CHROMEOS_DISKS_MOCK_DISK_MOUNT_MANAGER_H_
 
 #include <string>
 
 #include "base/observer_list.h"
@@ skipping 15 matching lines @@
   MOCK_METHOD1(RemoveObserver, void(DiskMountManager::Observer*));
   MOCK_CONST_METHOD0(disks, const DiskMountManager::DiskMap&(void));
   MOCK_CONST_METHOD1(FindDiskBySourcePath,
                      const DiskMountManager::Disk*(const std::string&));
   MOCK_CONST_METHOD0(mount_points,
                      const DiskMountManager::MountPointMap&(void));
   MOCK_METHOD0(RequestMountInfoRefresh, void(void));
   MOCK_METHOD4(MountPath, void(const std::string&, const std::string&,
                                const std::string&, MountType));
   MOCK_METHOD2(UnmountPath, void(const std::string&, UnmountOptions));
-  MOCK_METHOD1(FormatUnmountedDevice, void(const std::string&));
   MOCK_METHOD1(FormatMountedDevice, void(const std::string&));
   MOCK_METHOD3(UnmountDeviceRecursive, void(const std::string&,
       DiskMountManager::UnmountDeviceRecursiveCallbackType, void*));
 
   // Invokes fake device insert events.
   void NotifyDeviceInsertEvents();
 
   // Invokes fake device remove events.
   void NotifyDeviceRemoveEvents();
 
@@ skipping 22 matching lines @@
   // Is used to implement disks.
   const DiskMountManager::DiskMap& disksInternal() const { return disks_; }
 
   const DiskMountManager::MountPointMap& mountPointsInternal() const;
 
   // Returns Disk object associated with the |source_path| or NULL on failure.
   const DiskMountManager::Disk* FindDiskBySourcePathInternal(
       const std::string& source_path) const;
 
   // Notifies observers about device status update.
-  void NotifyDeviceChanged(DiskMountManagerEventType event,
+  void NotifyDeviceChanged(DeviceEvent event,
                            const std::string& path);
 
   // Notifies observers about disk status update.
-  void NotifyDiskChanged(DiskMountManagerEventType event,
+  void NotifyDiskChanged(DiskEvent event,
                          const DiskMountManager::Disk* disk);
 
   // The list of observers.
   ObserverList<DiskMountManager::Observer> observers_;
 
   // The list of disks found.
   DiskMountManager::DiskMap disks_;
 
   // The list of existing mount points.
   DiskMountManager::MountPointMap mount_points_;
 
   DISALLOW_COPY_AND_ASSIGN(MockDiskMountManager);
 };
 
 }  // namespace disks
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DISKS_MOCK_DISK_MOUNT_MANAGER_H_