Cut reference from MountedDiskMonitor to DiskMountManager.

chrome/browser/chromeos/file_manager/volume_manager_unittest.cc

 // Copyright 2013 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 "chrome/browser/chromeos/file_manager/volume_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 367 matching lines @@
 TEST_F(VolumeManagerTest, OnDiskEvent_Removed) {
   LoggingObserver observer;
   volume_manager()->AddObserver(&observer);
 
   const chromeos::disks::DiskMountManager::Disk kMountedDisk(
       "device1", "mount_path", "", "", "", "", "", "", "", "", "", "",
       chromeos::DEVICE_TYPE_UNKNOWN, 0, false, false, false, false, false);
   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];
   EXPECT_EQ("mount_path", unmount_request.mount_path);
   EXPECT_EQ(chromeos::UNMOUNT_OPTIONS_LAZY, unmount_request.options);
 
   volume_manager()->RemoveObserver(&observer);
 }
 
 TEST_F(VolumeManagerTest, OnDiskEvent_RemovedNotMounted) {
@@ skipping 114 matching lines @@
 TEST_F(VolumeManagerTest, OnMountEvent_Remounting) {
   scoped_ptr<chromeos::disks::DiskMountManager::Disk> disk(
       new chromeos::disks::DiskMountManager::Disk(
           "device1", "", "", "", "", "", "", "", "", "", "uuid1", "",
           chromeos::DEVICE_TYPE_UNKNOWN, 0,
           false, false, false, false, false));
   disk_mount_manager_->AddDiskForTest(disk.release());
   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);
+    volume_manager()->OnMountEvent(
+        chromeos::disks::DiskMountManager::UNMOUNTING,
+        chromeos::MOUNT_ERROR_NONE,
+        kMountPoint);
+
+    // Observe what happened for the mount event.
+    volume_manager()->AddObserver(&observer);
+
+    volume_manager()->OnMountEvent(
+        chromeos::disks::DiskMountManager::MOUNTING,
+        chromeos::MOUNT_ERROR_NONE,
+        kMountPoint);
   }
 
-  LoggingObserver observer;
-  volume_manager()->AddObserver(&observer);
-
-  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);
-
   ASSERT_EQ(1U, observer.events().size());
   const LoggingObserver::Event& event = observer.events()[0];
   EXPECT_EQ(LoggingObserver::Event::VOLUME_MOUNTED, event.type);
   EXPECT_EQ("device1", event.device_path);
   EXPECT_EQ(chromeos::MOUNT_ERROR_NONE, event.mount_error);
   EXPECT_TRUE(event.is_remounting);
 
   volume_manager()->RemoveObserver(&observer);
 }
 
@@ skipping 361 matching lines @@
   // Detach
   volume_manager()->OnRemovableStorageDetached(info);
   ASSERT_EQ(2u, observer.events().size());
   EXPECT_EQ(LoggingObserver::Event::VOLUME_UNMOUNTED,
             observer.events()[1].type);
 
   EXPECT_FALSE(volume_manager()->FindVolumeInfoById("mtp:model", &volume_info));
 }
 
 }  // namespace file_manager