Allow to pass remount option to Mount method of cros_disks_client.

chromeos/dbus/cros_disks_client_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 "chromeos/dbus/cros_disks_client.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 142 matching lines @@
   EXPECT_EQ(kDeviceSize, result.total_size_in_bytes());
   EXPECT_EQ(DEVICE_TYPE_SD, result.device_type());
   EXPECT_EQ(kMountPath, result.mount_path());
 }
 
 TEST(CrosDisksClientTest, ComposeMountOptions) {
   std::string kExpectedMountLabelOption =
       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]);
   EXPECT_EQ("nosuid", rw_mount_options[2]);
   EXPECT_EQ("rw", rw_mount_options[3]);
   EXPECT_EQ(kExpectedMountLabelOption, rw_mount_options[4]);
 
   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