Cut reference from MountedDiskMonitor to DiskMountManager.

chrome/browser/chromeos/file_manager/volume_manager_unittest.cc

Index: chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
diff --git a/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc b/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
index 8ccf697b31132beda01cd9f860abc402588b0de7..db38b6052571b7289a99d56ff45b5bfbeb9f076a 100644
--- a/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
+++ b/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
@@ -385,11 +385,15 @@ TEST_F(VolumeManagerTest, OnDiskEvent_Removed) {
   volume_manager()->OnDiskEvent(
       chromeos::disks::DiskMountManager::DISK_REMOVED, &kMountedDisk);
 
-  ASSERT_EQ(1U, observer.events().size());
+  ASSERT_EQ(2U, observer.events().size());
   const LoggingObserver::Event& event = observer.events()[0];
   EXPECT_EQ(LoggingObserver::Event::DISK_REMOVED, event.type);
   EXPECT_EQ("device1", event.device_path);
 
+  // Since the Disk has non-empty mount_path, it's regarded as hard unplugging.
+  EXPECT_EQ(LoggingObserver::Event::HARD_UNPLUGGED,
+            observer.events()[1].type);
+
   ASSERT_EQ(1U, disk_mount_manager_->unmount_requests().size());
   const FakeDiskMountManager::UnmountRequest& unmount_request =
       disk_mount_manager_->unmount_requests()[0];
@@ -524,31 +528,38 @@ TEST_F(VolumeManagerTest, OnMountEvent_Remounting) {
   disk_mount_manager_->MountPath(
       "device1", "", "", chromeos::MOUNT_TYPE_DEVICE);
 
+  const chromeos::disks::DiskMountManager::MountPointInfo kMountPoint(
+      "device1",
+      "mount1",
+      chromeos::MOUNT_TYPE_DEVICE,
+      chromeos::disks::MOUNT_CONDITION_NONE);
+
+  volume_manager()->OnMountEvent(
+      chromeos::disks::DiskMountManager::MOUNTING,
+      chromeos::MOUNT_ERROR_NONE,
+      kMountPoint);
+
+  LoggingObserver observer;
+
   // Emulate system suspend and then resume.
   {
     power_manager_client_->SendSuspendImminent();
     power_manager_client_->SendSuspendDone();
 
     // After resume, the device is unmounted and then mounted.
-    disk_mount_manager_->UnmountPath(
-        "device1", chromeos::UNMOUNT_OPTIONS_NONE,
-        chromeos::disks::DiskMountManager::UnmountPathCallback());
-    disk_mount_manager_->MountPath(
-        "device1", "", "", chromeos::MOUNT_TYPE_DEVICE);
-  }
-
-  LoggingObserver observer;
-  volume_manager()->AddObserver(&observer);
+    volume_manager()->OnMountEvent(
+        chromeos::disks::DiskMountManager::UNMOUNTING,
+        chromeos::MOUNT_ERROR_NONE,
+        kMountPoint);
 
-  const chromeos::disks::DiskMountManager::MountPointInfo kMountPoint(
-      "device1",
-      "mount1",
-      chromeos::MOUNT_TYPE_DEVICE,
-      chromeos::disks::MOUNT_CONDITION_NONE);
+    // Observe what happened for the mount event.
+    volume_manager()->AddObserver(&observer);
 
-  volume_manager()->OnMountEvent(chromeos::disks::DiskMountManager::MOUNTING,
-                                chromeos::MOUNT_ERROR_NONE,
-                                kMountPoint);
+    volume_manager()->OnMountEvent(
+        chromeos::disks::DiskMountManager::MOUNTING,
+        chromeos::MOUNT_ERROR_NONE,
+        kMountPoint);
+  }
 
   ASSERT_EQ(1U, observer.events().size());
   const LoggingObserver::Event& event = observer.events()[0];