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

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.h"
 #include "base/stl_util.h"
@@ skipping 74 matching lines @@
       false,  // is_read_only
       true,  // has_media
       false,  // on_boot_device
       false));  // is_hidden
 
   disks_.clear();
   disks_.insert(std::pair<std::string, DiskMountManager::Disk*>(
       std::string(kTestDevicePath), disk1.get()));
 
   // Device Added
-  DiskMountManagerEventType event;
-  event = MOUNT_DEVICE_ADDED;
-  NotifyDeviceChanged(event, kTestSystemPath);
+  NotifyDeviceChanged(DEVICE_ADDED, kTestSystemPath);
 
   // Disk Added
-  event = MOUNT_DISK_ADDED;
-  NotifyDiskChanged(event, disk1.get());
+  NotifyDiskChanged(DISK_ADDED, disk1.get());
 
   // Disk Changed
   scoped_ptr<DiskMountManager::Disk> disk2(new DiskMountManager::Disk(
       std::string(kTestDevicePath),
       std::string(kTestMountPath),
       std::string(kTestSystemPath),
       std::string(kTestFilePath),
       std::string(kTestDeviceLabel),
       std::string(kTestDriveLabel),
       std::string(kTestVendorId),
       std::string(kTestVendorName),
       std::string(kTestProductId),
       std::string(kTestProductName),
       std::string(kTestUuid),
       std::string(kTestSystemPathPrefix),
       DEVICE_TYPE_MOBILE,
       1073741824,
       false,  // is_parent
       false,  // is_read_only
       true,  // has_media
       false,  // on_boot_device
       false));  // is_hidden
   disks_.clear();
   disks_.insert(std::pair<std::string, DiskMountManager::Disk*>(
       std::string(kTestDevicePath), disk2.get()));
-  event = MOUNT_DISK_CHANGED;
-  NotifyDiskChanged(event, disk2.get());
+  NotifyDiskChanged(DISK_CHANGED, disk2.get());
 }
 
 void MockDiskMountManager::NotifyDeviceRemoveEvents() {
   scoped_ptr<DiskMountManager::Disk> disk(new DiskMountManager::Disk(
       std::string(kTestDevicePath),
       std::string(kTestMountPath),
       std::string(kTestSystemPath),
       std::string(kTestFilePath),
       std::string(kTestDeviceLabel),
       std::string(kTestDriveLabel),
       std::string(kTestVendorId),
       std::string(kTestVendorName),
       std::string(kTestProductId),
       std::string(kTestProductName),
       std::string(kTestUuid),
       std::string(kTestSystemPathPrefix),
       DEVICE_TYPE_SD,
       1073741824,
       false,  // is_parent
       false,  // is_read_only
       true,  // has_media
       false,  // on_boot_device
       false));  // is_hidden
   disks_.clear();
   disks_.insert(std::pair<std::string, DiskMountManager::Disk*>(
       std::string(kTestDevicePath), disk.get()));
-  NotifyDiskChanged(MOUNT_DISK_REMOVED, disk.get());
+  NotifyDiskChanged(DISK_REMOVED, disk.get());
 }
 
 void MockDiskMountManager::SetupDefaultReplies() {
   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())
       .Times(AnyNumber());
   EXPECT_CALL(*this, MountPath(_, _, _, _))
       .Times(AnyNumber());
   EXPECT_CALL(*this, UnmountPath(_, _))
       .Times(AnyNumber());
-  EXPECT_CALL(*this, FormatUnmountedDevice(_))
-      .Times(AnyNumber());
   EXPECT_CALL(*this, FormatMountedDevice(_))
       .Times(AnyNumber());
   EXPECT_CALL(*this, UnmountDeviceRecursive(_, _, _))
       .Times(AnyNumber());
 }
 
 void MockDiskMountManager::CreateDiskEntryForMountDevice(
     const DiskMountManager::MountPointInfo& mount_info,
     const std::string& device_id,
     const std::string& device_label) {
@@ skipping 40 matching lines @@
 }
 
 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::NotifyDiskChanged(
-    DiskMountManagerEventType event,
+    DiskEvent event,
     const DiskMountManager::Disk* disk) {
-  FOR_EACH_OBSERVER(Observer, observers_, DiskChanged(event, disk));
+  FOR_EACH_OBSERVER(Observer, observers_, OnDiskEvent(event, disk));
 }
 
-void MockDiskMountManager::NotifyDeviceChanged(DiskMountManagerEventType event,
+void MockDiskMountManager::NotifyDeviceChanged(DeviceEvent event,
                                                const std::string& path) {
-  FOR_EACH_OBSERVER(Observer, observers_, DeviceChanged(event, path));
+  FOR_EACH_OBSERVER(Observer, observers_, OnDeviceEvent(event, path));
 }
 
 }  // namespace disks
 }  // namespace chromeos