Preserve the hardware read-only flag in Disk object.

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 19 matching lines @@
 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;
   const char* device_label;
   const char* drive_label;
   const char* vendor_id;
   const char* vendor_name;
   const char* product_id;
   const char* product_name;
   const char* fs_uuid;
   const char* system_path_prefix;
@@ skipping 13 matching lines @@
   const char* mount_path;
   chromeos::MountType mount_type;
   chromeos::disks::MountCondition mount_condition;
 };
 
 // List of disks held in DiskMountManager at the begining of the test.
 const TestDiskInfo kTestDisks[] = {
   {
     kDevice1SourcePath,
     kDevice1MountPath,
+    false,      // write_disabled_by_policy

[hashimoto, 2016/10/21 07:28:04]

nit: 2 spaces before a comment.

[yamaguchi, 2016/10/21 08:27:03]

Done.

     "/device/prefix/system_path",
     "/device/file_path",
     "/device/device_label",
     "/device/drive_label",
     "/device/vendor_id",
     "/device/vendor_name",
     "/device/product_id",
     "/device/product_name",
     "/device/fs_uuid",
     "/device/prefix",
     chromeos::DEVICE_TYPE_USB,
     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,
+    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",
     "/device/prefix2",
     chromeos::DEVICE_TYPE_SD,
     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
   },
   {
     kReadOnlyDeviceSourcePath,
     kReadOnlyDeviceMountPath,
+    false,      // write_disabled_by_policy
     "/device/prefix/system_path_3",
     "/device/file_path_3",
     "/device/device_label_3",
     "/device/drive_label_3",
     "/device/vendor_id_3",
     "/device/vendor_name_3",
     "/device/product_id_3",
     "/device/product_name_3",
     "/device/fs_uuid_3",
     "/device/prefix",
@@ skipping 309 matching lines @@
     const DiskMountManager::MountPointMap& mount_points =
         DiskMountManager::GetInstance()->mount_points();
     return mount_points.find(mount_path) != mount_points.end();
   }
 
  private:
   // Adds a new disk to the disk mount manager.
   void AddTestDisk(const TestDiskInfo& disk) {
     EXPECT_TRUE(DiskMountManager::GetInstance()->AddDiskForTest(
         base::MakeUnique<DiskMountManager::Disk>(
-            disk.source_path, disk.mount_path, disk.system_path, disk.file_path,
-            disk.device_label, disk.drive_label, disk.vendor_id,
-            disk.vendor_name, disk.product_id, disk.product_name, disk.fs_uuid,
-            disk.system_path_prefix, disk.device_type, disk.size_in_bytes,
-            disk.is_parent, disk.is_read_only, disk.has_media,
-            disk.on_boot_device, disk.on_removable_device, disk.is_hidden)));
+            disk.source_path, disk.mount_path, disk.write_disabled_by_policy,
+            disk.system_path, disk.file_path, disk.device_label,
+            disk.drive_label, disk.vendor_id, disk.vendor_name, disk.product_id,
+            disk.product_name, disk.fs_uuid, disk.system_path_prefix,
+            disk.device_type, disk.size_in_bytes, disk.is_parent,
+            disk.is_read_only, disk.has_media, disk.on_boot_device,
+            disk.on_removable_device, disk.is_hidden)));
   }
 
   // Adds a new mount point to the disk mount manager.
   // If the moutn point is a device mount point, disk with its source path
   // should already be added to the disk mount manager.
   void AddTestMountPoint(const TestMountPointInfo& mount_point) {
     EXPECT_TRUE(DiskMountManager::GetInstance()->AddMountPointForTest(
         DiskMountManager::MountPointInfo(mount_point.source_path,
                                          mount_point.mount_path,
                                          mount_point.mount_type,
@@ skipping 422 matching lines @@
   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());
 }
 
 }  // namespace