Add a method to remount all removable devices in DiskMountManager.

chromeos/disks/disk_mount_manager_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.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 11 matching lines @@
 using chromeos::DBusThreadManager;
 using chromeos::FakeCrosDisksClient;
 using chromeos::MountType;
 using chromeos::disks::MountCondition;
 
 namespace {
 
 const char kDevice1SourcePath[] = "/device/source_path";
 const char kDevice1MountPath[] = "/device/mount_path";
 const char kDevice2SourcePath[] = "/device/source_path2";
-const char kDevice2MountPath[] = "/device/mount_path2";
 const char kReadOnlyDeviceMountPath[] = "/device/read_only_mount_path";
 const char kReadOnlyDeviceSourcePath[] = "/device/read_only_source_path";
 
 // Holds information needed to create a DiskMountManager::Disk instance.
 struct TestDiskInfo {
   const char* source_path;
   const char* mount_path;
   bool write_disabled_by_policy;
   const char* system_path;
   const char* file_path;
@@ skipping 43 matching lines @@
     1073741824,  // size in bytes
     false,       // is parent
     false,       // is read only
     true,        // has media
     false,       // is on boot device
     true,        // is on removable device
     false        // is hidden
   },
   {
     kDevice2SourcePath,
-    kDevice2MountPath,
+    "",  // not mounted initially
     false,  // write_disabled_by_policy
     "/device/prefix/system_path2",
     "/device/file_path2",
     "/device/device_label2",
     "/device/drive_label2",
     "/device/vendor_id2",
     "/device/vendor_name2",
     "/device/product_id2",
     "/device/product_name2",
     "/device/fs_uuid2",
@@ skipping 781 matching lines @@
   // Event handlers of observers should be called.
   ASSERT_EQ(1U, observer_->GetEventCount());
   VerifyMountEvent(observer_->GetMountEvent(0), DiskMountManager::MOUNTING,
                    chromeos::MOUNT_ERROR_NONE, kReadOnlyDeviceMountPath);
   const DiskMountManager::DiskMap& disks = manager->disks();
   ASSERT_GT(disks.count(kReadOnlyDeviceSourcePath), 0U);
   // The mounted disk should preserve the read-only flag of the block device.
   EXPECT_TRUE(disks.find(kReadOnlyDeviceSourcePath)->second->is_read_only());
 }
 
+TEST_F(DiskMountManagerTest, RemountRemovableDrives) {
+  DiskMountManager* manager = DiskMountManager::GetInstance();
+  manager->RemountAllRemovableDrives(chromeos::MOUNT_ACCESS_MODE_READ_ONLY);
+
+  // Simulate cros_disks reporting mount completed.
+  fake_cros_disks_client_->SendMountCompletedEvent(
+      chromeos::MOUNT_ERROR_NONE, kDevice1SourcePath,
+      chromeos::MOUNT_TYPE_DEVICE, kDevice1MountPath);
+
+  // Should remount all devices but read-only hardwares.

[hashimoto, 2016/10/27 08:31:52]

"but read-only hardwares" what this mean?
It seems the "is read only" values of device1 and device2 are both false.

[yamaguchi, 2016/10/27 09:52:41]

It means that "all volumes should be remounted, but those for a device that is
read-only by its hardware, should not be remounted".
The test has only 1 device remounted, so I changed the comment to avoid the
confusion.
Also added comment abotut the initial condition used here.

+  ASSERT_EQ(1U, observer_->GetEventCount());
+  VerifyMountEvent(observer_->GetMountEvent(0), DiskMountManager::MOUNTING,
+                   chromeos::MOUNT_ERROR_NONE, kDevice1MountPath);
+  // The device is remounted in read-only mode.
+  EXPECT_TRUE(
+      manager->FindDiskBySourcePath(kDevice1SourcePath)->is_read_only());
+  // Remounted disk should also appear as read-only to observers.
+  EXPECT_TRUE(observer_->GetMountEvent(0).disk->is_read_only());
+
+  // Remount in read-write mode again.
+  manager->RemountAllRemovableDrives(chromeos::MOUNT_ACCESS_MODE_READ_WRITE);
+
+  // Simulate cros_disks reporting mount completed.
+  fake_cros_disks_client_->SendMountCompletedEvent(
+      chromeos::MOUNT_ERROR_NONE, kDevice1SourcePath,
+      chromeos::MOUNT_TYPE_DEVICE, kDevice1MountPath);
+  // Event handlers of observers should be called.
+  ASSERT_EQ(2U, observer_->GetEventCount());
+  VerifyMountEvent(observer_->GetMountEvent(1), DiskMountManager::MOUNTING,
+                   chromeos::MOUNT_ERROR_NONE, kDevice1MountPath);
+  // The read-write device should be remounted in read-write mode.
+  EXPECT_FALSE(
+      manager->FindDiskBySourcePath(kDevice1SourcePath)->is_read_only());
+  // Remounted disk should also appear as writable to observers.
+  EXPECT_FALSE(observer_->GetMountEvent(1).disk->is_read_only());
+}
+
 }  // namespace