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

chrome/browser/system_monitor/removable_device_notifications_chromeos_unittest.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.
 
 // chromeos::RemovableDeviceNotificationsCros unit tests.
 
 #include "chrome/browser/system_monitor/removable_device_notifications_chromeos.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 70 matching lines @@
   }
 
   void MountDevice(MountError error_code,
                    const DiskMountManager::MountPointInfo& mount_info,
                    const std::string& unique_id,
                    const std::string& device_label) {
     if (error_code == MOUNT_ERROR_NONE) {
       disk_mount_manager_mock_->CreateDiskEntryForMountDevice(
         mount_info, unique_id, device_label);
     }
-    notifications_->MountCompleted(disks::DiskMountManager::MOUNTING,
-                                   error_code,
-                                   mount_info);
+    notifications_->OnMountEvent(disks::DiskMountManager::MOUNTING,
+                                 error_code,
+                                 mount_info);
     WaitForFileThread();
   }
 
   void UnmountDevice(MountError error_code,
                      const DiskMountManager::MountPointInfo& mount_info) {
-    notifications_->MountCompleted(disks::DiskMountManager::UNMOUNTING,
-                                   error_code,
-                                   mount_info);
+    notifications_->OnMountEvent(disks::DiskMountManager::UNMOUNTING,
+                                 error_code,
+                                 mount_info);
     if (error_code == MOUNT_ERROR_NONE) {
       disk_mount_manager_mock_->RemoveDiskEntryForMountDevice(
           mount_info);
     }
     WaitForFileThread();
   }
 
   // Create a directory named |dir| relative to the test directory.
   // Set |with_dcim_dir| to true if the created directory will have a "DCIM"
   // subdirectory.
@@ skipping 128 matching lines @@
   // Unsupported file system.
   mount_info.mount_type = MOUNT_TYPE_DEVICE;
   mount_info.mount_condition = disks::MOUNT_CONDITION_UNSUPPORTED_FILESYSTEM;
   EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(0);
   MountDevice(MOUNT_ERROR_NONE, mount_info, kUniqueId, kDevice1Name);
 }
 
 }  // namespace
 
 }  // namespace chrome