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

chromeos/dbus/cros_disks_client.cc

Index: chromeos/dbus/cros_disks_client.cc
diff --git a/chromeos/dbus/cros_disks_client.cc b/chromeos/dbus/cros_disks_client.cc
index a7c50d2e8edf58edaba17e511a59b8280b435a2d..ab24b378c2fe68f353add9ce81ecfe4959fa8e3a 100644
--- a/chromeos/dbus/cros_disks_client.cc
+++ b/chromeos/dbus/cros_disks_client.cc
@@ -229,13 +229,13 @@ class CrosDisksClientImpl : public CrosDisksClient {
       const MountEventHandler& mount_event_handler,
       const MountCompletedHandler& mount_completed_handler) OVERRIDE {
     static const SignalEventTuple kSignalEventTuples[] = {
-      { cros_disks::kDeviceAdded, DEVICE_ADDED },
-      { cros_disks::kDeviceScanned, DEVICE_SCANNED },
-      { cros_disks::kDeviceRemoved, DEVICE_REMOVED },
-      { cros_disks::kDiskAdded, DISK_ADDED },
-      { cros_disks::kDiskChanged, DISK_CHANGED },
-      { cros_disks::kDiskRemoved, DISK_REMOVED },
-      { cros_disks::kFormattingFinished, FORMATTING_FINISHED },
+      { cros_disks::kDeviceAdded, CROS_DISKS_DEVICE_ADDED },
+      { cros_disks::kDeviceScanned, CROS_DISKS_DEVICE_SCANNED },
+      { cros_disks::kDeviceRemoved, CROS_DISKS_DEVICE_REMOVED },
+      { cros_disks::kDiskAdded, CROS_DISKS_DISK_ADDED },
+      { cros_disks::kDiskChanged, CROS_DISKS_DISK_CHANGED },
+      { cros_disks::kDiskRemoved, CROS_DISKS_DISK_REMOVED },
+      { cros_disks::kFormattingFinished, CROS_DISKS_FORMATTING_FINISHED },
     };
     const size_t kNumSignalEventTuples = arraysize(kSignalEventTuples);