1 files changed, 38 insertions, 20 deletions
diff --git a/chromium/content/browser/file_system_access/file_system_access_manager_impl_unittest.cc b/chromium/content/browser/file_system_access/file_system_access_manager_impl_unittest.cc
index 3a637514c87..767307d3f18 100644
--- a/chromium/content/browser/file_system_access/file_system_access_manager_impl_unittest.cc
+++ b/chromium/content/browser/file_system_access/file_system_access_manager_impl_unittest.cc
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/callback_helpers.h"
+#include "base/feature_list.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/guid.h"
@@ -23,6 +24,7 @@
 #include "components/services/storage/public/cpp/buckets/bucket_id.h"
 #include "components/services/storage/public/cpp/buckets/bucket_locator.h"
 #include "components/services/storage/public/cpp/buckets/constants.h"
+#include "content/browser/file_system_access/features.h"
 #include "content/browser/file_system_access/file_system_access_data_transfer_token_impl.h"
 #include "content/browser/file_system_access/file_system_access_directory_handle_impl.h"
 #include "content/browser/file_system_access/file_system_access_file_handle_impl.h"
@@ -247,16 +249,19 @@ class FileSystemAccessManagerImplTest : public testing::Test {
         path_type, file_path, kBindingContext.process_id(),
         token_remote.InitWithNewPipeAndPassReceiver());
 
-    EXPECT_CALL(
-        permission_context_,
-        ConfirmSensitiveEntryAccess_(
-            kTestStorageKey.origin(),
-            FileSystemAccessPermissionContext::PathType::kLocal, file_path,
-            FileSystemAccessPermissionContext::HandleType::kFile,
-            FileSystemAccessPermissionContext::UserAction::kDragAndDrop,
-            kFrameId, testing::_))
-        .WillOnce(RunOnceCallback<6>(
-            FileSystemAccessPermissionContext::SensitiveEntryResult::kAllowed));
+    if (base::FeatureList::IsEnabled(
+            features::kFileSystemAccessDragAndDropCheckBlocklist)) {
+      EXPECT_CALL(
+          permission_context_,
+          ConfirmSensitiveEntryAccess_(
+              kTestStorageKey.origin(),
+              FileSystemAccessPermissionContext::PathType::kLocal, file_path,
+              FileSystemAccessPermissionContext::HandleType::kFile,
+              FileSystemAccessPermissionContext::UserAction::kDragAndDrop,
+              kFrameId, testing::_))
+          .WillOnce(RunOnceCallback<6>(FileSystemAccessPermissionContext::
+                                           SensitiveEntryResult::kAllowed));
+    }
 
     // Expect permission requests when the token is sent to be redeemed.
     EXPECT_CALL(
@@ -305,16 +310,19 @@ class FileSystemAccessManagerImplTest : public testing::Test {
         path_type, dir_path, kBindingContext.process_id(),
         token_remote.InitWithNewPipeAndPassReceiver());
 
-    EXPECT_CALL(
-        permission_context_,
-        ConfirmSensitiveEntryAccess_(
-            kTestStorageKey.origin(),
-            FileSystemAccessPermissionContext::PathType::kLocal, dir_path,
-            FileSystemAccessPermissionContext::HandleType::kDirectory,
-            FileSystemAccessPermissionContext::UserAction::kDragAndDrop,
-            kFrameId, testing::_))
-        .WillOnce(RunOnceCallback<6>(
-            FileSystemAccessPermissionContext::SensitiveEntryResult::kAllowed));
+    if (base::FeatureList::IsEnabled(
+            features::kFileSystemAccessDragAndDropCheckBlocklist)) {
+      EXPECT_CALL(
+          permission_context_,
+          ConfirmSensitiveEntryAccess_(
+              kTestStorageKey.origin(),
+              FileSystemAccessPermissionContext::PathType::kLocal, dir_path,
+              FileSystemAccessPermissionContext::HandleType::kDirectory,
+              FileSystemAccessPermissionContext::UserAction::kDragAndDrop,
+              kFrameId, testing::_))
+          .WillOnce(RunOnceCallback<6>(FileSystemAccessPermissionContext::
+                                           SensitiveEntryResult::kAllowed));
+    }
 
     // Expect permission requests when the token is sent to be redeemed.
     EXPECT_CALL(
@@ -1285,6 +1293,11 @@ TEST_F(FileSystemAccessManagerImplTest,
 
 TEST_F(FileSystemAccessManagerImplTest,
        GetEntryFromDataTransferToken_File_SensitivePath) {
+  if (!base::FeatureList::IsEnabled(
+          features::kFileSystemAccessDragAndDropCheckBlocklist)) {
+    return;
+  }
+
   base::FilePath file_path = dir_.GetPath().AppendASCII("mr_file");
   ASSERT_TRUE(base::CreateTemporaryFile(&file_path));
 
@@ -1320,6 +1333,11 @@ TEST_F(FileSystemAccessManagerImplTest,
 
 TEST_F(FileSystemAccessManagerImplTest,
        GetEntryFromDataTransferToken_Directory_SensitivePath) {
+  if (!base::FeatureList::IsEnabled(
+          features::kFileSystemAccessDragAndDropCheckBlocklist)) {
+    return;
+  }
+
   const base::FilePath& kDirPath = dir_.GetPath().AppendASCII("mr_directory");
   ASSERT_TRUE(base::CreateDirectory(kDirPath));