Keep track of the list of currently mounted volumes in C++-side VolumeManager.

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 141 matching lines @@
                                             disk_mount_manager_.get()));
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<chromeos::FakePowerManagerClient> power_manager_client_;
   scoped_ptr<FakeDiskMountManager> disk_mount_manager_;
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<VolumeManager> volume_manager_;
 };
 
-TEST_F(VolumeManagerTest, OnFileSystemMounted) {
+TEST_F(VolumeManagerTest, OnDriveFileSystemMountAndUnmount) {
   LoggingObserver observer;
   volume_manager_->AddObserver(&observer);
 
   volume_manager_->OnFileSystemMounted();
 
   ASSERT_EQ(1U, observer.events().size());
-  const LoggingObserver::Event& event = observer.events()[0];
+  LoggingObserver::Event event = observer.events()[0];
   EXPECT_EQ(LoggingObserver::Event::VOLUME_MOUNTED, event.type);
   EXPECT_EQ(drive::util::GetDriveMountPointPath(profile_.get()).AsUTF8Unsafe(),
             event.device_path);
   EXPECT_EQ(chromeos::MOUNT_ERROR_NONE, event.mount_error);
   EXPECT_FALSE(event.is_remounting);
 
-  volume_manager_->RemoveObserver(&observer);
-}
-
-TEST_F(VolumeManagerTest, OnFileSystemBeingUnmounted) {
-  LoggingObserver observer;
-  volume_manager_->AddObserver(&observer);
-
   volume_manager_->OnFileSystemBeingUnmounted();
 
-  ASSERT_EQ(1U, observer.events().size());
-  const LoggingObserver::Event& event = observer.events()[0];
+  ASSERT_EQ(2U, observer.events().size());
+  event = observer.events()[1];
   EXPECT_EQ(LoggingObserver::Event::VOLUME_UNMOUNTED, event.type);
   EXPECT_EQ(drive::util::GetDriveMountPointPath(profile_.get()).AsUTF8Unsafe(),
             event.device_path);
   EXPECT_EQ(chromeos::MOUNT_ERROR_NONE, event.mount_error);
 
   volume_manager_->RemoveObserver(&observer);
 }
 
+TEST_F(VolumeManagerTest, OnDriveFileSystemUnmountWithoutMount) {
+  LoggingObserver observer;
+  volume_manager_->AddObserver(&observer);
+  volume_manager_->OnFileSystemBeingUnmounted();
+
+  // Unmount event for non-mounted volume is not reported.
+  ASSERT_EQ(0U, observer.events().size());
+  volume_manager_->RemoveObserver(&observer);
+}
+
 TEST_F(VolumeManagerTest, OnDiskEvent_Hidden) {
   LoggingObserver observer;
   volume_manager_->AddObserver(&observer);
 
   const bool kIsHidden = true;
   const chromeos::disks::DiskMountManager::Disk kDisk(
       "device1", "", "", "", "", "", "", "", "", "", "", "",
       chromeos::DEVICE_TYPE_UNKNOWN, 0, false, false, false, false, kIsHidden);
 
   volume_manager_->OnDiskEvent(
@@ skipping 223 matching lines @@
 
   volume_manager_->OnDeviceEvent(
       chromeos::disks::DiskMountManager::DEVICE_SCANNED, "device1");
 
   // SCANNED event is just ignored.
   EXPECT_EQ(0U, observer.events().size());
 
   volume_manager_->RemoveObserver(&observer);
 }
 
-TEST_F(VolumeManagerTest, OnMountEvent_Mounting) {
+TEST_F(VolumeManagerTest, OnMountEvent_MountingAndUnmounting) {
   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];
+  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_FALSE(event.is_remounting);
 
+  volume_manager_->OnMountEvent(chromeos::disks::DiskMountManager::UNMOUNTING,
+                                chromeos::MOUNT_ERROR_NONE,
+                                kMountPoint);
+
+  ASSERT_EQ(2U, observer.events().size());
+  event = observer.events()[1];
+  EXPECT_EQ(LoggingObserver::Event::VOLUME_UNMOUNTED, event.type);
+  EXPECT_EQ("device1", event.device_path);
+  EXPECT_EQ(chromeos::MOUNT_ERROR_NONE, event.mount_error);
+
   volume_manager_->RemoveObserver(&observer);
 }
 
 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());
@@ skipping 34 matching lines @@
   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);
 }
 
-TEST_F(VolumeManagerTest, OnMountEvent_Unmounting) {
+TEST_F(VolumeManagerTest, OnMountEvent_UnmountingWithoutMounting) {
   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::UNMOUNTING,
                                 chromeos::MOUNT_ERROR_NONE,
                                 kMountPoint);
 
-  ASSERT_EQ(1U, observer.events().size());
-  const LoggingObserver::Event& event = observer.events()[0];
-  EXPECT_EQ(LoggingObserver::Event::VOLUME_UNMOUNTED, event.type);
-  EXPECT_EQ("device1", event.device_path);
-  EXPECT_EQ(chromeos::MOUNT_ERROR_NONE, event.mount_error);
+  // Unmount event for a disk not mounted in this manager is not reported.
+  ASSERT_EQ(0U, observer.events().size());
 
   volume_manager_->RemoveObserver(&observer);
 }
 
 TEST_F(VolumeManagerTest, OnFormatEvent_Started) {
   LoggingObserver observer;
   volume_manager_->AddObserver(&observer);
 
   volume_manager_->OnFormatEvent(
       chromeos::disks::DiskMountManager::FORMAT_STARTED,
@@ skipping 123 matching lines @@
   VolumeInfo volume_info;
   ASSERT_FALSE(volume_manager_->FindVolumeInfoById(
       "nonexistent", &volume_info));
   ASSERT_TRUE(volume_manager_->FindVolumeInfoById(
       "downloads:Downloads", &volume_info));
   EXPECT_EQ("downloads:Downloads", volume_info.volume_id);
   EXPECT_EQ(VOLUME_TYPE_DOWNLOADS_DIRECTORY, volume_info.type);
 }
 
 }  // namespace file_manager