Allow to pass remount option to Mount method of cros_disks_client.

chromeos/dbus/cros_disks_client_unittest.cc

Index: chromeos/dbus/cros_disks_client_unittest.cc
diff --git a/chromeos/dbus/cros_disks_client_unittest.cc b/chromeos/dbus/cros_disks_client_unittest.cc
index 49b27d9163677d0222ef1a03548e5de77d470375..84aeb4be0062daec9a36a8e875f19964ff84a793 100644
--- a/chromeos/dbus/cros_disks_client_unittest.cc
+++ b/chromeos/dbus/cros_disks_client_unittest.cc
@@ -160,7 +160,8 @@ TEST(CrosDisksClientTest, ComposeMountOptions) {
       std::string("mountlabel=") + kMountLabel;
   std::vector<std::string> rw_mount_options =
       CrosDisksClient::ComposeMountOptions(kMountLabel,
-                                           MOUNT_ACCESS_MODE_READ_WRITE);
+                                           MOUNT_ACCESS_MODE_READ_WRITE,
+                                           REMOUNT_OPTION_MOUNT_NEW_DEVICE);
   ASSERT_EQ(5U, rw_mount_options.size());
   EXPECT_EQ("nodev", rw_mount_options[0]);
   EXPECT_EQ("noexec", rw_mount_options[1]);
@@ -170,13 +171,26 @@ TEST(CrosDisksClientTest, ComposeMountOptions) {
 
   std::vector<std::string> ro_mount_options =
       CrosDisksClient::ComposeMountOptions(kMountLabel,
-                                           MOUNT_ACCESS_MODE_READ_ONLY);
+                                           MOUNT_ACCESS_MODE_READ_ONLY,
+                                           REMOUNT_OPTION_MOUNT_NEW_DEVICE);
   ASSERT_EQ(5U, ro_mount_options.size());
   EXPECT_EQ("nodev", ro_mount_options[0]);
   EXPECT_EQ("noexec", ro_mount_options[1]);
   EXPECT_EQ("nosuid", ro_mount_options[2]);
   EXPECT_EQ("ro", ro_mount_options[3]);
   EXPECT_EQ(kExpectedMountLabelOption, ro_mount_options[4]);
+
+  std::vector<std::string> remount_mount_options =
+      CrosDisksClient::ComposeMountOptions(
+          kMountLabel, MOUNT_ACCESS_MODE_READ_WRITE,
+          REMOUNT_OPTION_REMOUNT_EXISTING_DEVICE);
+  ASSERT_EQ(6U, remount_mount_options.size());
+  EXPECT_EQ("nodev", remount_mount_options[0]);
+  EXPECT_EQ("noexec", remount_mount_options[1]);
+  EXPECT_EQ("nosuid", remount_mount_options[2]);
+  EXPECT_EQ("rw", remount_mount_options[3]);
+  EXPECT_EQ("remount", remount_mount_options[4]);
+  EXPECT_EQ(kExpectedMountLabelOption, remount_mount_options[5]);
 }
 
 }  // namespace chromeos