diff --git a/build/patches/Keep-disabled-cache-sharing-for-pervasive-scripts.patch b/build/patches/Keep-disabled-cache-sharing-for-pervasive-scripts.patch index 2c0aa7b9..a5026b65 100644 --- a/build/patches/Keep-disabled-cache-sharing-for-pervasive-scripts.patch +++ b/build/patches/Keep-disabled-cache-sharing-for-pervasive-scripts.patch @@ -6,15 +6,14 @@ Keeps disabled the new feature that allows bypassing the cache partition for spe License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - .../features_cc/Disable-Cache-Sharing-For-PervasiveScripts.inc | 2 ++ - 1 file changed, 2 insertions(+) + .../features_cc/Disable-Cache-Sharing-For-PervasiveScripts.inc | 1 + + 1 file changed, 1 insertion(+) create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-Cache-Sharing-For-PervasiveScripts.inc diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-Cache-Sharing-For-PervasiveScripts.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-Cache-Sharing-For-PervasiveScripts.inc new file mode 100644 --- /dev/null +++ b/cromite_flags/services/network/public/cpp/features_cc/Disable-Cache-Sharing-For-PervasiveScripts.inc -@@ -0,0 +1,2 @@ +@@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kCacheSharingForPervasiveScripts); -+ -- diff --git a/build/patches/Temp-guard-FileSystemAccessPersistentPermissions.patch b/build/patches/Temp-guard-FileSystemAccessPersistentPermissions.patch index 5e0e1395..777030f4 100644 --- a/build/patches/Temp-guard-FileSystemAccessPersistentPermissions.patch +++ b/build/patches/Temp-guard-FileSystemAccessPersistentPermissions.patch @@ -10,22 +10,22 @@ Subject: Temp guard FileSystemAccessPersistentPermissions diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -478,7 +478,7 @@ bool ShouldBlockAccessToPath( - auto should_block_with_rule = [&](const base::FilePath& block_path, - BlockType block_type) -> bool { - if (path == block_path || path.IsParent(block_path)) { -- VLOG(1) << "Blocking access to " << path << " because it is a parent of " -+ LOG(INFO) << "Blocking access to " << path << " because it is a parent of " - << block_path; +@@ -460,7 +460,7 @@ bool ShouldBlockAccessToPath( + normalize_file_paths ? NormalizeFilePath(block.path) : block.path; + + if (check_path == blocked_path || check_path.IsParent(blocked_path)) { +- VLOG(1) << "Blocking access to " << check_path ++ LOG(INFO) << "Blocking access to " << check_path + << " because it is a parent of " << blocked_path; return true; } -@@ -527,7 +527,7 @@ bool ShouldBlockAccessToPath( +@@ -487,7 +487,7 @@ bool ShouldBlockAccessToPath( } // The nearest ancestor blocks access to its children, so block access. -- VLOG(1) << "Blocking access to " << path << " because it is inside " -+ LOG(INFO) << "Blocking access to " << path << " because it is inside " - << nearest_ancestor << " and it's kBlockAllChildren"; +- VLOG(1) << "Blocking access to " << check_path << " because it is inside " ++ LOG(INFO) << "Blocking access to " << check_path << " because it is inside " + << nearest_ancestor; return true; } diff --git a/chrome/browser/file_system_access/file_system_access_features.cc b/chrome/browser/file_system_access/file_system_access_features.cc