1 files changed, 35 insertions, 38 deletions

diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/disable-download-quarantine.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/disable-download-quarantine.patch
index 2191bbe..44d5aca 100644
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/disable-download-quarantine.patch
+++ b/www/chromium-uc/patches/extra/ungoogled-chromium/disable-download-quarantine.patch
@@ -1,18 +1,18 @@
 # Disables file download quarantining
 
---- components/download/internal/common/base_file.cc.orig
-+++ components/download/internal/common/base_file.cc
-@@ -23,7 +23,6 @@
+--- a/components/download/internal/common/base_file.cc
++++ b/components/download/internal/common/base_file.cc
+@@ -22,7 +22,6 @@
  #include "components/download/public/common/download_interrupt_reasons_utils.h"
  #include "components/download/public/common/download_item.h"
  #include "components/download/public/common/download_stats.h"
 -#include "components/services/quarantine/quarantine.h"
  #include "crypto/secure_hash.h"
  
- #if defined(OS_WIN)
-@@ -535,105 +534,6 @@ DownloadInterruptReason BaseFile::Publis
+ #if BUILDFLAG(IS_ANDROID)
+@@ -525,102 +524,6 @@ DownloadInterruptReason BaseFile::Publis
  }
- #endif  // defined(OS_ANDROID)
+ #endif  // BUILDFLAG(IS_ANDROID)
  
 -namespace {
 -
@@ -102,27 +102,24 @@
 -
 -void BaseFile::OnQuarantineServiceError(const GURL& source_url,
 -                                        const GURL& referrer_url) {
--#if defined(OS_WIN)
--  if (base::FeatureList::IsEnabled(quarantine::kOutOfProcessQuarantine)) {
--    OnFileQuarantined(/*connection_error=*/true,
--                      quarantine::SetInternetZoneIdentifierDirectly(
--                          full_path_, source_url, referrer_url));
--    return;
--  }
--#endif  // defined(OS_WIN)
--
+-#if BUILDFLAG(IS_WIN)
+-  OnFileQuarantined(/*connection_error=*/true,
+-                    quarantine::SetInternetZoneIdentifierDirectly(
+-                        full_path_, source_url, referrer_url));
+-#else   // !BUILDFLAG(IS_WIN)
 -  CHECK(false) << "In-process quarantine service should not have failed.";
+-#endif  // !BUILDFLAG(IS_WIN)
 -}
  
  void BaseFile::AnnotateWithSourceInformation(
      const std::string& client_guid,
-@@ -641,32 +541,8 @@ void BaseFile::AnnotateWithSourceInforma
+@@ -628,32 +531,8 @@ void BaseFile::AnnotateWithSourceInforma
      const GURL& referrer_url,
      mojo::PendingRemote<quarantine::mojom::Quarantine> remote_quarantine,
      OnAnnotationDoneCallback on_annotation_done_callback) {
 -  GURL authority_url = GetEffectiveAuthorityURL(source_url, referrer_url);
 -  if (!remote_quarantine) {
--#if defined(OS_WIN)
+-#if BUILDFLAG(IS_WIN)
 -    quarantine::mojom::QuarantineFileResult result =
 -        quarantine::SetInternetZoneIdentifierDirectly(full_path_, authority_url,
 -                                                      referrer_url);
@@ -151,8 +148,8 @@
  }
  
  }  // namespace download
---- content/browser/BUILD.gn.orig
-+++ content/browser/BUILD.gn
+--- a/content/browser/BUILD.gn
++++ b/content/browser/BUILD.gn
 @@ -82,7 +82,6 @@ source_set("browser") {
      "//components/permissions:permissions_common",
      "//components/power_scheduler",
@@ -161,17 +158,17 @@
      "//components/services/storage",
      "//components/services/storage:filesystem_proxy_factory",
      "//components/services/storage/dom_storage:local_storage_proto",
---- content/browser/file_system_access/safe_move_helper.cc.orig
-+++ content/browser/file_system_access/safe_move_helper.cc
-@@ -12,7 +12,6 @@
- #include "base/task/thread_pool.h"
+--- a/content/browser/file_system_access/safe_move_helper.cc
++++ b/content/browser/file_system_access/safe_move_helper.cc
+@@ -13,7 +13,6 @@
  #include "base/threading/sequenced_task_runner_handle.h"
  #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
 -#include "components/services/quarantine/quarantine.h"
  #include "content/browser/file_system_access/file_system_access_error.h"
  #include "content/public/browser/content_browser_client.h"
  #include "content/public/common/content_client.h"
-@@ -193,20 +192,8 @@ void SafeMoveHelper::DidAfterWriteCheck(
+@@ -194,20 +193,8 @@ void SafeMoveHelper::DidAfterWriteCheck(
    // not exist anymore. In case of error, the source file URL will point to a
    // valid filesystem location.
    base::OnceCallback<void(base::File::Error)> result_callback;
@@ -190,9 +187,9 @@
                                       weak_factory_.GetWeakPtr());
 -  }
    manager_->DoFileSystemOperation(
-       FROM_HERE, &storage::FileSystemOperationRunner::MoveFileLocal,
-       std::move(result_callback), source_url(), dest_url(), option_);
-@@ -220,7 +207,6 @@ void SafeMoveHelper::DidFileSkipQuaranti
+       FROM_HERE, &storage::FileSystemOperationRunner::Move,
+       std::move(result_callback), source_url(), dest_url(), options_,
+@@ -223,7 +210,6 @@ void SafeMoveHelper::DidFileSkipQuaranti
  void SafeMoveHelper::DidFileDoQuarantine(
      const storage::FileSystemURL& target_url,
      const GURL& referrer_url,
@@ -200,7 +197,7 @@
      base::File::Error result) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
  
-@@ -251,37 +237,9 @@ void SafeMoveHelper::DidFileDoQuarantine
+@@ -254,37 +240,9 @@ void SafeMoveHelper::DidFileDoQuarantine
        referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS()
            ? referrer_url
            : GURL();
@@ -218,7 +215,7 @@
 -                           std::move(quarantine_remote)),
 -            quarantine::mojom::QuarantineFileResult::ANNOTATION_FAILED));
 -  } else {
--#if defined(OS_WIN)
+-#if BUILDFLAG(IS_WIN)
 -    base::ThreadPool::PostTaskAndReplyWithResult(
 -        FROM_HERE, {base::MayBlock()},
 -        base::BindOnce(&quarantine::SetInternetZoneIdentifierDirectly,
@@ -238,8 +235,8 @@
      quarantine::mojom::QuarantineFileResult result) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
  
---- content/browser/file_system_access/safe_move_helper.h.orig
-+++ content/browser/file_system_access/safe_move_helper.h
+--- a/content/browser/file_system_access/safe_move_helper.h
++++ b/content/browser/file_system_access/safe_move_helper.h
 @@ -58,10 +58,8 @@ class CONTENT_EXPORT SafeMoveHelper {
    void DidFileDoQuarantine(
        const storage::FileSystemURL& target_url,
@@ -251,13 +248,13 @@
        quarantine::mojom::QuarantineFileResult result);
  
    void ComputeHashForSourceFile(HashCallback callback);
---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig
-+++ content/browser/renderer_host/pepper/pepper_file_io_host.cc
+--- a/content/browser/renderer_host/pepper/pepper_file_io_host.cc
++++ b/content/browser/renderer_host/pepper/pepper_file_io_host.cc
 @@ -456,7 +456,7 @@ void PepperFileIOHost::OnLocalFileOpened
      ppapi::host::ReplyMessageContext reply_context,
      const base::FilePath& path,
      base::File::Error error_code) {
--#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if 0
    // Quarantining a file before its contents are available is only supported on
    // Windows and Linux.
@@ -266,15 +263,15 @@
  #endif
  }
  
--#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if 0
  void PepperFileIOHost::OnLocalFileQuarantined(
      ppapi::host::ReplyMessageContext reply_context,
      const base::FilePath& path,
---- content/browser/renderer_host/pepper/pepper_file_io_host.h.orig
-+++ content/browser/renderer_host/pepper/pepper_file_io_host.h
+--- a/content/browser/renderer_host/pepper/pepper_file_io_host.h
++++ b/content/browser/renderer_host/pepper/pepper_file_io_host.h
 @@ -13,7 +13,6 @@
- #include "base/macros.h"
+ #include "base/memory/raw_ptr.h"
  #include "base/memory/ref_counted.h"
  #include "base/memory/weak_ptr.h"
 -#include "components/services/quarantine/public/mojom/quarantine.mojom.h"