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

chromeos/disks/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_DISK_MOUNT_MANAGER_H_
 #define CHROMEOS_DISKS_DISK_MOUNT_MANAGER_H_
 
 #include <map>
 
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/cros_disks_client.h"
 
 namespace chromeos {
 namespace disks {
 
-// Types of events DiskMountManager sends to its observers.
-enum DiskMountManagerEventType {
-  MOUNT_DISK_ADDED,
-  MOUNT_DISK_REMOVED,
-  MOUNT_DISK_CHANGED,
-  MOUNT_DISK_MOUNTED,
-  MOUNT_DISK_UNMOUNTED,
-  MOUNT_DEVICE_ADDED,
-  MOUNT_DEVICE_REMOVED,
-  MOUNT_DEVICE_SCANNED,
-  MOUNT_FORMATTING_STARTED,
-  MOUNT_FORMATTING_FINISHED,
-};
-
 // Condition of mounted filesystem.
 enum MountCondition {
   MOUNT_CONDITION_NONE,
   MOUNT_CONDITION_UNKNOWN_FILESYSTEM,
   MOUNT_CONDITION_UNSUPPORTED_FILESYSTEM,
 };
 
 // This class handles the interaction with cros-disks.
 // Other classes can add themselves as observers.
 class CHROMEOS_EXPORT DiskMountManager {
  public:
-  // Event type given to observers' MountCompleted method.
+  // Event types passed to the observers.
+  enum DiskEvent {
+    DISK_ADDED,
+    DISK_REMOVED,
+    DISK_CHANGED,
+  };
+
+  enum DeviceEvent {
+    DEVICE_ADDED,
+    DEVICE_REMOVED,
+    DEVICE_SCANNED,
+  };
+
   enum MountEvent {
     MOUNTING,
     UNMOUNTING,
   };
 
+  enum FormatEvent {
+    FORMAT_STARTED,
+    FORMAT_COMPLETED
+  };
+
   // Used to house an instance of each found mount device.
   class Disk {
    public:
     Disk(const std::string& device_path,
          const std::string& mount_path,
          const std::string& system_path,
          const std::string& file_path,
          const std::string& device_label,
          const std::string& drive_label,
          const std::string& vendor_id,
@@ skipping 132 matching lines @@
 
   // A callback function type which is called after UnmountDeviceRecursive
   // finishes.
   typedef void(*UnmountDeviceRecursiveCallbackType)(void*, bool);
 
   // Implement this interface to be notified about disk/mount related events.
   class Observer {
    public:
     virtual ~Observer() {}
 
-    // A function called when disk mount status is changed.
-    virtual void DiskChanged(DiskMountManagerEventType event,
-                             const Disk* disk) = 0;
-    // A function called when device status is changed.
-    virtual void DeviceChanged(DiskMountManagerEventType event,
+    // Called when disk mount status is changed.
+    virtual void OnDiskEvent(DiskEvent event, const Disk* disk) = 0;
+    // Called when device status is changed.
+    virtual void OnDeviceEvent(DeviceEvent event,
                                const std::string& device_path) = 0;
-    // A function called after mount is completed.
-    virtual void MountCompleted(MountEvent event_type,
-                                MountError error_code,
-                                const MountPointInfo& mount_info) = 0;
+    // Called after a mount point has been mounted or unmounted.
+    virtual void OnMountEvent(MountEvent event,
+                              MountError error_code,
+                              const MountPointInfo& mount_info) = 0;
+    // Called on format process events.
+    virtual void OnFormatEvent(FormatEvent event,
+                               FormatError error_code,
+                               const std::string& device_path) = 0;
   };
 
   virtual ~DiskMountManager() {}
 
   // Adds an observer.
   virtual void AddObserver(Observer* observer) = 0;
 
   // Removes an observer.
   virtual void RemoveObserver(Observer* observer) = 0;
 
@@ skipping 14 matching lines @@
   virtual void MountPath(const std::string& source_path,
                          const std::string& source_format,
                          const std::string& mount_label,
                          MountType type) = 0;
 
   // Unmounts a mounted disk.
   // |UnmountOptions| enum defined in chromeos/dbus/cros_disks_client.h.
   virtual void UnmountPath(const std::string& mount_path,
                            UnmountOptions options) = 0;
 
-  // Formats device given its file path.
-  // Example: file_path: /dev/sdb1
-  virtual void FormatUnmountedDevice(const std::string& file_path) = 0;
-
   // Formats Device given its mount path. Unmounts the device.
   // Example: mount_path: /media/VOLUME_LABEL
   virtual void FormatMountedDevice(const std::string& mount_path) = 0;
 
   // Unmounts device_path and all of its known children.
   virtual void UnmountDeviceRecursive(
       const std::string& device_path,
       UnmountDeviceRecursiveCallbackType callback,
       void* user_data) = 0;
 
+  // Used in tests to initialize the manager's disk and mount point sets.
+  // Default implementation does noting. It just fails.
+  virtual bool AddDiskForTest(Disk* disk);
+  virtual bool AddMountPointForTest(const MountPointInfo& mount_point);
+
   // Returns corresponding string to |type| like "device" or "file".
   static std::string MountTypeToString(MountType type);
 
   // The inverse function of MountTypeToString.
   static MountType MountTypeFromString(const std::string& type_str);
 
   // Returns corresponding string to |type| like "unknown_filesystem".
   static std::string MountConditionToString(MountCondition type);
 
   // Returns corresponding string to |type|, like "sd", "usb".
@@ skipping 13 matching lines @@
 
   // Returns a pointer to the global DiskMountManager instance.
   // Initialize() should already have been called.
   static DiskMountManager* GetInstance();
 };
 
 }  // namespace disks
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DISKS_DISK_MOUNT_MANAGER_H_