62 files changed, 0 insertions, 4847 deletions

diff --git a/www/chromium-uc/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch b/www/chromium-uc/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
deleted file mode 100644
index 2d6821f..0000000
--- a/www/chromium-uc/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-# Adds two flags:
-# 1. --fingerprinting-client-rects-noise to enable fingerprinting deception for Range::getClientRects and Element::getBoundingClientRect
-# 2. --fingerprinting-canvas-measuretext-noise to enable fingerprinting deception for Canvas::measureText
-# Tweaks based on https://github.com/bromite/bromite/blob/b1bc96bbd9ec549cf496e87f487a0ac35c83df0a/patches/BRM052_getClientRects-getBoundingClientRect-measureText-add-fingerprinting-mitigation.patch
-# Originally based on https://github.com/Eloston/ungoogled-chromium/pull/377/commits/4151259b3248f0fc5c42fa262a1d1dd43c39fb60
-# chrome://flag setting added by ungoogled-chromium developers
-#
-# Unlike the latest Bromite patch, it was chosen to not regenerate the noise value each time the value is read to prevent potential efficiency issues with the load on the RNG.
-
---- chrome/browser/BUILD.gn.orig
-+++ chrome/browser/BUILD.gn
-@@ -2370,6 +2370,7 @@ static_library("browser") {
-     "//third_party/libyuv",
-     "//third_party/metrics_proto",
-     "//third_party/re2",
-+    "//components/ungoogled:ungoogled_switches",
-     "//third_party/webrtc_overrides:webrtc_component",
-     "//third_party/widevine/cdm:buildflags",
-     "//third_party/widevine/cdm:headers",
---- chrome/browser/about_flags.cc.orig
-+++ chrome/browser/about_flags.cc
-@@ -151,6 +151,7 @@
- #include "components/translate/core/browser/translate_ranker_impl.h"
- #include "components/translate/core/common/translate_util.h"
- #include "components/ui_devtools/switches.h"
-+#include "components/ungoogled/ungoogled_switches.h"
- #include "components/version_info/version_info.h"
- #include "components/viz/common/features.h"
- #include "components/viz/common/switches.h"
---- chrome/browser/bromite_flag_entries.h.orig
-+++ chrome/browser/bromite_flag_entries.h
-@@ -4,4 +4,12 @@
- 
- #ifndef CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
- #define CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
-+    {"fingerprinting-client-rects-noise",
-+     "Enable get*ClientRects() fingerprint deception",
-+     "Scale the output values of Range::getClientRects() and Element::getBoundingClientRect() with a randomly selected factor in the range -0.0003% to 0.0003%, which are recomputed on every document initialization.  ungoogled-chromium flag, Bromite feature.",
-+     kOsAll, SINGLE_VALUE_TYPE(switches::kFingerprintingClientRectsNoise)},
-+    {"fingerprinting-canvas-measuretext-noise",
-+     "Enable Canvas::measureText() fingerprint deception",
-+     "Scale the output values of Canvas::measureText() with a randomly selected factor in the range -0.0003% to 0.0003%, which are recomputed on every document initialization.  ungoogled-chromium flag, Bromite feature.",
-+     kOsAll, SINGLE_VALUE_TYPE(switches::kFingerprintingCanvasMeasureTextNoise)},
- #endif  // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
---- content/browser/BUILD.gn.orig
-+++ content/browser/BUILD.gn
-@@ -222,6 +222,7 @@ source_set("browser") {
-     "//third_party/libyuv",
-     "//third_party/re2",
-     "//third_party/sqlite",
-+    "//components/ungoogled:ungoogled_switches",
-     "//third_party/webrtc_overrides:webrtc_component",
-     "//third_party/wtl",
-     "//third_party/zlib",
---- content/browser/renderer_host/render_process_host_impl.cc.orig
-+++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -68,6 +68,7 @@
- #include "components/services/storage/public/mojom/cache_storage_control.mojom.h"
- #include "components/services/storage/public/mojom/indexed_db_control.mojom.h"
- #include "components/tracing/common/tracing_switches.h"
-+#include "components/ungoogled/ungoogled_switches.h"
- #include "components/viz/common/switches.h"
- #include "components/viz/host/gpu_client.h"
- #include "content/browser/bad_message.h"
-@@ -3465,6 +3466,8 @@ void RenderProcessHostImpl::PropagateBro
-     switches::kEnableWebGLDraftExtensions,
-     switches::kEnableWebGLImageChromium,
-     switches::kFileUrlPathAlias,
-+    switches::kFingerprintingClientRectsNoise,
-+    switches::kFingerprintingCanvasMeasureTextNoise,
-     switches::kForceDeviceScaleFactor,
-     switches::kForceDisplayColorProfile,
-     switches::kForceGpuMemAvailableMb,
---- content/child/BUILD.gn.orig
-+++ content/child/BUILD.gn
-@@ -103,6 +103,7 @@ target(link_target_type, "child") {
-     "//third_party/blink/public/common",
-     "//third_party/blink/public/strings",
-     "//third_party/ced",
-+    "//components/ungoogled:ungoogled_switches",
-     "//third_party/zlib/google:compression_utils",
-     "//ui/base",
-     "//ui/events/blink",
---- content/child/runtime_features.cc.orig
-+++ content/child/runtime_features.cc
-@@ -31,6 +31,7 @@
- #include "third_party/blink/public/common/loader/referrer_utils.h"
- #include "third_party/blink/public/common/switches.h"
- #include "third_party/blink/public/platform/web_runtime_features.h"
-+#include "components/ungoogled/ungoogled_switches.h"
- #include "ui/accessibility/accessibility_features.h"
- #include "ui/base/ui_base_features.h"
- #include "ui/events/blink/blink_features.h"
-@@ -466,6 +467,10 @@ void SetRuntimeFeaturesFromCommandLine(c
-       {wrf::EnableWebGPU, switches::kEnableUnsafeWebGPU, true},
-       {wrf::ForceOverlayFullscreenVideo, switches::kForceOverlayFullscreenVideo,
-        true},
-+      {wrf::EnableFingerprintingClientRectsNoise,
-+       switches::kFingerprintingClientRectsNoise, true},
-+      {wrf::EnableFingerprintingCanvasMeasureTextNoise,
-+       switches::kFingerprintingCanvasMeasureTextNoise, true},
-   };
-   for (const auto& mapping : switchToFeatureMapping) {
-     if (command_line.HasSwitch(mapping.switch_name))
---- third_party/blink/public/platform/web_runtime_features.h.orig
-+++ third_party/blink/public/platform/web_runtime_features.h
-@@ -218,6 +218,8 @@ class WebRuntimeFeatures {
-   BLINK_PLATFORM_EXPORT static void EnableMediaControlsExpandGesture(bool);
-   BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
-   BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
-+  BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
-+  BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
-   BLINK_PLATFORM_EXPORT static void EnableSignedExchangeSubresourcePrefetch(
-       bool);
-   BLINK_PLATFORM_EXPORT static void EnableSubresourceWebBundles(bool);
---- third_party/blink/renderer/core/dom/document.cc.orig
-+++ third_party/blink/renderer/core/dom/document.cc
-@@ -42,6 +42,7 @@
- #include "base/containers/contains.h"
- #include "base/debug/dump_without_crashing.h"
- #include "base/metrics/histogram_functions.h"
-+#include "base/rand_util.h"
- #include "base/time/time.h"
- #include "cc/input/overscroll_behavior.h"
- #include "cc/input/scroll_snap_data.h"
-@@ -855,6 +856,14 @@ Range* Document::CreateRangeAdjustedToTr
-                                      Position::BeforeNode(*shadow_host));
- }
- 
-+double Document::GetNoiseFactorX() {
-+  return noise_factor_x_;
-+}
-+
-+double Document::GetNoiseFactorY() {
-+  return noise_factor_y_;
-+}
-+
- SelectorQueryCache& Document::GetSelectorQueryCache() {
-   if (!selector_query_cache_)
-     selector_query_cache_ = std::make_unique<SelectorQueryCache>();
-@@ -2145,6 +2154,15 @@ void Document::UpdateStyleAndLayoutTreeF
- #if DCHECK_IS_ON()
-   AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */);
- #endif
-+
-+  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
-+    // Precompute -0.0003% to 0.0003% noise factor for get*ClientRect*() fingerprinting
-+    noise_factor_x_ = 1 + (base::RandDouble() - 0.5) * 0.000003;
-+    noise_factor_y_ = 1 + (base::RandDouble() - 0.5) * 0.000003;
-+  } else {
-+    noise_factor_x_ = 1;
-+    noise_factor_y_ = 1;
-+  }
- }
- 
- void Document::InvalidateStyleAndLayoutForFontUpdates() {
---- third_party/blink/renderer/core/dom/document.h.orig
-+++ third_party/blink/renderer/core/dom/document.h
-@@ -456,6 +456,10 @@ class CORE_EXPORT Document : public Cont
-     has_xml_declaration_ = has_xml_declaration ? 1 : 0;
-   }
- 
-+  // Values for get*ClientRect fingerprint deception
-+  double GetNoiseFactorX();
-+  double GetNoiseFactorY();
-+
-   AtomicString visibilityState() const;
-   bool IsPageVisible() const;
-   bool hidden() const;
-@@ -2078,6 +2082,9 @@ class CORE_EXPORT Document : public Cont
- 
-   base::ElapsedTimer start_time_;
- 
-+  double noise_factor_x_;
-+  double noise_factor_y_;
-+
-   Member<ScriptRunner> script_runner_;
- 
-   HeapVector<Member<ScriptElementBase>> current_script_stack_;
---- third_party/blink/renderer/core/dom/element.cc.orig
-+++ third_party/blink/renderer/core/dom/element.cc
-@@ -2114,6 +2114,11 @@ DOMRectList* Element::getClientRects() {
-   DCHECK(element_layout_object);
-   GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
-       quads, *element_layout_object);
-+  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
-+    for (FloatQuad& quad : quads) {
-+      quad.Scale(GetDocument().GetNoiseFactorX(), GetDocument().GetNoiseFactorY());
-+    }
-+  }
-   return MakeGarbageCollected<DOMRectList>(quads);
- }
- 
-@@ -2131,6 +2136,9 @@ FloatRect Element::GetBoundingClientRect
-   DCHECK(element_layout_object);
-   GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
-                                                         *element_layout_object);
-+  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
-+    result.Scale(GetDocument().GetNoiseFactorX(), GetDocument().GetNoiseFactorY());
-+  }
-   return result;
- }
- 
---- third_party/blink/renderer/core/dom/range.cc.orig
-+++ third_party/blink/renderer/core/dom/range.cc
-@@ -1598,11 +1598,21 @@ DOMRectList* Range::getClientRects() con
-   Vector<FloatQuad> quads;
-   GetBorderAndTextQuads(quads);
- 
-+  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
-+    for (FloatQuad& quad : quads) {
-+      quad.Scale(owner_document_->GetNoiseFactorX(), owner_document_->GetNoiseFactorY());
-+    }
-+  }
-+
-   return MakeGarbageCollected<DOMRectList>(quads);
- }
- 
- DOMRect* Range::getBoundingClientRect() const {
--  return DOMRect::FromFloatRect(BoundingRect());
-+  auto rect = BoundingRect();
-+  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
-+    rect.Scale(owner_document_->GetNoiseFactorX(), owner_document_->GetNoiseFactorY());
-+  }
-+  return DOMRect::FromFloatRect(rect);
- }
- 
- // TODO(editing-dev): We should make
---- third_party/blink/renderer/core/html/canvas/text_metrics.cc.orig
-+++ third_party/blink/renderer/core/html/canvas/text_metrics.cc
-@@ -55,6 +55,24 @@ TextMetrics::TextMetrics(const Font& fon
-   Update(font, direction, baseline, align, text);
- }
- 
-+void TextMetrics::Shuffle(const double factor) {
-+  // x-direction
-+  width_ *= factor;
-+  actual_bounding_box_left_ *= factor;
-+  actual_bounding_box_right_ *= factor;
-+
-+  // y-direction
-+  font_bounding_box_ascent_ *= factor;
-+  font_bounding_box_descent_ *= factor;
-+  actual_bounding_box_ascent_ *= factor;
-+  actual_bounding_box_descent_ *= factor;
-+  em_height_ascent_ *= factor;
-+  em_height_descent_ *= factor;
-+  baselines_->setAlphabetic(baselines_->alphabetic() * factor);
-+  baselines_->setHanging(baselines_->hanging() * factor);
-+  baselines_->setIdeographic(baselines_->ideographic() * factor);
-+}
-+
- void TextMetrics::Update(const Font& font,
-                          const TextDirection& direction,
-                          const TextBaseline& baseline,
---- third_party/blink/renderer/core/html/canvas/text_metrics.h.orig
-+++ third_party/blink/renderer/core/html/canvas/text_metrics.h
-@@ -64,6 +64,8 @@ class CORE_EXPORT TextMetrics final : pu
- 
-   void Trace(Visitor*) const override;
- 
-+  void Shuffle(const double factor);
-+
-  private:
-   void Update(const Font&,
-               const TextDirection&,
---- third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc.orig
-+++ third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-@@ -912,9 +912,15 @@ TextMetrics* CanvasRenderingContext2D::m
-   TextDirection direction =
-       ToTextDirection(GetState().GetDirection(), canvas());
- 
--  return MakeGarbageCollected<TextMetrics>(font, direction,
-+  TextMetrics* text_metrics = MakeGarbageCollected<TextMetrics>(font, direction,
-                                            GetState().GetTextBaseline(),
-                                            GetState().GetTextAlign(), text);
-+
-+  // Scale text metrics if enabled
-+  if (RuntimeEnabledFeatures::FingerprintingCanvasMeasureTextNoiseEnabled()) {
-+    text_metrics->Shuffle(canvas()->GetDocument().GetNoiseFactorX());
-+  }
-+  return text_metrics;
- }
- 
- void CanvasRenderingContext2D::fillFormattedText(
---- third_party/blink/renderer/platform/BUILD.gn.orig
-+++ third_party/blink/renderer/platform/BUILD.gn
-@@ -1686,6 +1686,7 @@ component("platform") {
-     "//components/paint_preview/common",
-     "//components/power_scheduler",
-     "//components/search_engines:search_engine_utils",
-+    "//components/ungoogled:ungoogled_switches",
-     "//components/viz/client",
-     "//components/viz/common",
-     "//crypto",
---- third_party/blink/renderer/platform/exported/web_runtime_features.cc.orig
-+++ third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -689,4 +689,12 @@ void WebRuntimeFeatures::EnableCLSScroll
-   RuntimeEnabledFeatures::SetCLSScrollAnchoringEnabled(enable);
- }
- 
-+void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) {
-+  RuntimeEnabledFeatures::SetFingerprintingClientRectsNoiseEnabled(enable);
-+}
-+
-+void WebRuntimeFeatures::EnableFingerprintingCanvasMeasureTextNoise(bool enable) {
-+  RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
-+}
-+
- }  // namespace blink
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig
-+++ third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1076,6 +1076,12 @@
-       origin_trial_feature_name: "Fledge",
-     },
-     {
-+      name: "FingerprintingClientRectsNoise",
-+    },
-+    {
-+      name: "FingerprintingCanvasMeasureTextNoise",
-+    },
-+    {
-       name: "FocuslessSpatialNavigation",
-       settable_from_internals: true,
-     },
diff --git a/www/chromium-uc/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch b/www/chromium-uc/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
deleted file mode 100644
index 6ebc7a1..0000000
--- a/www/chromium-uc/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
+++ /dev/null
@@ -1,334 +0,0 @@
-# NOTE: Changes made:
-# * Added flag --fingerprinting-canvas-image-data-noise to enable/disable
-#   Canvas image data fingerprinting deception
-# * Removed WebGLDebugRendererInfo disabling in favor of an alternative
-#   implementation in ungoogled-chromium/disable-webgl-renderer-info.patch
-# * Tweak subchannel noise generation to require fewer random number generation
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 24 Mar 2018 05:18:03 +0100
-Subject: Canvas: fingerprinting mitigations for image data and webGL
-
-Disable webGL renderer info and modify the color data returned by ToBlob,
-ToDataURL and getImageData so that it will contain randomly manipulated
-pixels (maximum 10) that slightly change the color of the R,G,B components
-without a visible effect.
-
-Credits to Slaviro (https://github.com/Slaviro) for coming up with a better
-approach to change color components.
----
- .../platform/graphics/image_data_buffer.cc         |   5 +
- .../platform/graphics/static_bitmap_image.cc       | 154 +++++++++++++++++++++
- .../platform/graphics/static_bitmap_image.h        |   2 +
- 4 files changed, 163 insertions(+), 2 deletions(-)
-
---- chrome/browser/bromite_flag_entries.h.orig
-+++ chrome/browser/bromite_flag_entries.h
-@@ -16,4 +16,8 @@
-      flag_descriptions::kMaxConnectionsPerHostName,
-      flag_descriptions::kMaxConnectionsPerHostDescription,
-      kOsAll, MULTI_VALUE_TYPE(kMaxConnectionsPerHostChoices)},
-+    {"fingerprinting-canvas-image-data-noise",
-+     "Enable Canvas image data fingerprint deception",
-+     "Slightly modifies at most 10 pixels in Canvas image data extracted via JS APIs.  ungoogled-chromium flag, Bromite feature.",
-+     kOsAll, SINGLE_VALUE_TYPE(switches::kFingerprintingCanvasImageDataNoise)},
- #endif  // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
---- content/browser/renderer_host/render_process_host_impl.cc.orig
-+++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -3468,6 +3468,7 @@ void RenderProcessHostImpl::PropagateBro
-     switches::kFileUrlPathAlias,
-     switches::kFingerprintingClientRectsNoise,
-     switches::kFingerprintingCanvasMeasureTextNoise,
-+    switches::kFingerprintingCanvasImageDataNoise,
-     switches::kForceDeviceScaleFactor,
-     switches::kForceDisplayColorProfile,
-     switches::kForceGpuMemAvailableMb,
---- content/child/runtime_features.cc.orig
-+++ content/child/runtime_features.cc
-@@ -471,6 +471,8 @@ void SetRuntimeFeaturesFromCommandLine(c
-        switches::kFingerprintingClientRectsNoise, true},
-       {wrf::EnableFingerprintingCanvasMeasureTextNoise,
-        switches::kFingerprintingCanvasMeasureTextNoise, true},
-+      {wrf::EnableFingerprintingCanvasImageDataNoise,
-+       switches::kFingerprintingCanvasImageDataNoise, true},
-   };
-   for (const auto& mapping : switchToFeatureMapping) {
-     if (command_line.HasSwitch(mapping.switch_name))
---- third_party/blink/public/platform/web_runtime_features.h.orig
-+++ third_party/blink/public/platform/web_runtime_features.h
-@@ -220,6 +220,7 @@ class WebRuntimeFeatures {
-   BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
-   BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
-   BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
-+  BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasImageDataNoise(bool);
-   BLINK_PLATFORM_EXPORT static void EnableSignedExchangeSubresourcePrefetch(
-       bool);
-   BLINK_PLATFORM_EXPORT static void EnableSubresourceWebBundles(bool);
---- third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc.orig
-+++ third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
-@@ -30,6 +30,7 @@
- #include "third_party/blink/renderer/platform/graphics/bitmap_image.h"
- #include "third_party/blink/renderer/platform/graphics/graphics_context.h"
- #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h"
-+#include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
- #include "third_party/blink/renderer/platform/graphics/stroke_data.h"
- #include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h"
- #include "third_party/blink/renderer/platform/heap/heap.h"
-@@ -2311,6 +2312,9 @@ ImageData* BaseRenderingContext2D::getIm
-           snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
-       DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
-     }
-+    if (read_pixels_successful && RuntimeEnabledFeatures::FingerprintingCanvasImageDataNoiseEnabled()) {
-+      StaticBitmapImage::ShuffleSubchannelColorData(image_data_pixmap.addr(), image_data_pixmap.info(), sx, sy);
-+    }
-   }
- 
-   return image_data;
---- third_party/blink/renderer/platform/BUILD.gn.orig
-+++ third_party/blink/renderer/platform/BUILD.gn
-@@ -1645,7 +1645,9 @@ component("platform") {
-     "//third_party/blink/renderer:non_test_config",
-   ]
- 
--  include_dirs = []
-+  include_dirs = [
-+    "//third_party/skia/include/private", # For shuffler in graphics/static_bitmap_image.cc
-+  ]
- 
-   allow_circular_includes_from = [
-     "//third_party/blink/renderer/platform/blob",
---- third_party/blink/renderer/platform/exported/web_runtime_features.cc.orig
-+++ third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -697,4 +697,8 @@ void WebRuntimeFeatures::EnableFingerpri
-   RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
- }
- 
-+void WebRuntimeFeatures::EnableFingerprintingCanvasImageDataNoise(bool enable) {
-+  RuntimeEnabledFeatures::SetFingerprintingCanvasImageDataNoiseEnabled(enable);
-+}
-+
- }  // namespace blink
---- third_party/blink/renderer/platform/graphics/image_data_buffer.cc.orig
-+++ third_party/blink/renderer/platform/graphics/image_data_buffer.cc
-@@ -36,6 +36,8 @@
- 
- #include "base/compiler_specific.h"
- #include "base/memory/ptr_util.h"
-+#include "base/rand_util.h"
-+#include "base/logging.h"
- #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
- #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
- #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
-@@ -145,6 +147,11 @@ bool ImageDataBuffer::EncodeImageInterna
-                                           const SkPixmap& pixmap) const {
-   DCHECK(is_valid_);
- 
-+  if (RuntimeEnabledFeatures::FingerprintingCanvasImageDataNoiseEnabled()) {
-+    // shuffle subchannel color data within the pixmap
-+    StaticBitmapImage::ShuffleSubchannelColorData(pixmap_.writable_addr(), pixmap_.info(), 0, 0);
-+  }
-+
-   if (mime_type == kMimeTypeJpeg) {
-     SkJpegEncoder::Options options;
-     options.fQuality = ImageEncoder::ComputeJpegQuality(quality);
---- third_party/blink/renderer/platform/graphics/static_bitmap_image.cc.orig
-+++ third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
-@@ -4,6 +4,8 @@
- 
- #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
- 
-+#include "base/rand_util.h"
-+#include "base/logging.h"
- #include "base/numerics/checked_math.h"
- #include "gpu/command_buffer/client/gles2_interface.h"
- #include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h"
-@@ -11,10 +13,12 @@
- #include "third_party/blink/renderer/platform/graphics/image_observer.h"
- #include "third_party/blink/renderer/platform/graphics/paint/paint_image.h"
- #include "third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.h"
-+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
- #include "third_party/skia/include/core/SkCanvas.h"
- #include "third_party/skia/include/core/SkImage.h"
- #include "third_party/skia/include/core/SkPaint.h"
- #include "third_party/skia/include/core/SkSurface.h"
-+#include "third_party/skia/include/private/SkColorData.h"
- #include "v8/include/v8.h"
- 
- namespace blink {
-@@ -80,4 +84,154 @@ void StaticBitmapImage::DrawHelper(cc::P
-       WebCoreClampingModeToSkiaRectConstraint(draw_options.clamping_mode));
- }
- 
-+// set the component to maximum-delta if it is >= maximum, or add to existing color component (color + delta)
-+#define shuffleComponent(color, max, delta) ( (color) >= (max) ? ((max)-(delta)) : ((color)+(delta)) )
-+
-+#define writable_addr(T, p, stride, x, y) (T*)((const char *)p + y * stride + x * sizeof(T))
-+
-+void StaticBitmapImage::ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY) {
-+  auto w = info.width() - srcX, h = info.height() - srcY;
-+
-+  // skip tiny images; info.width()/height() can also be 0
-+  if ((w < 8) || (h < 8)) {
-+    return;
-+  }
-+
-+  // generate the first random number here
-+  double shuffleX = base::RandDouble();
-+
-+  // cap maximum pixels to change
-+  auto pixels = (w + h) / 128;
-+  if (pixels > 10) {
-+    pixels = 10;
-+  } else if (pixels < 2) {
-+    pixels = 2;
-+  }
-+
-+  auto colorType = info.colorType();
-+  auto fRowBytes = info.minRowBytes(); // stride
-+
-+  DLOG(INFO) << "BRM: ShuffleSubchannelColorData() w=" << w << " h=" << h << " colorType=" << colorType << " fRowBytes=" << fRowBytes;
-+
-+  // second random number (for y/height)
-+  double shuffleY = base::RandDouble();
-+
-+  // calculate random coordinates using bisection
-+  auto currentW = w, currentH = h;
-+  for(;pixels >= 0; pixels--) {
-+    int x = currentW * shuffleX, y = currentH * shuffleY;
-+
-+    // calculate randomisation amounts for each RGB component
-+    uint8_t shuffleR = base::RandInt(0, 4);
-+    uint8_t shuffleG = (shuffleR + x) % 4;
-+    uint8_t shuffleB = (shuffleG + y) % 4;
-+
-+    // manipulate pixel data to slightly change the R, G, B components
-+    switch (colorType) {
-+      case kAlpha_8_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint8_t, addr, fRowBytes, x, y);
-+         auto r = SkColorGetR(*pixel), g = SkColorGetG(*pixel), b = SkColorGetB(*pixel), a = SkColorGetA(*pixel);
-+
-+         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
-+         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
-+         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
-+         // alpha is left unchanged
-+
-+         *pixel = SkColorSetARGB(a, r, g, b);
-+      }
-+      break;
-+      case kGray_8_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint8_t, addr, fRowBytes, x, y);
-+         *pixel = shuffleComponent(*pixel, UINT8_MAX-1, shuffleB);
-+      }
-+      break;
-+      case kRGB_565_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint16_t, addr, fRowBytes, x, y);
-+         unsigned    r = SkPacked16ToR32(*pixel);
-+         unsigned    g = SkPacked16ToG32(*pixel);
-+         unsigned    b = SkPacked16ToB32(*pixel);
-+
-+         r = shuffleComponent(r, 31, shuffleR);
-+         g = shuffleComponent(g, 63, shuffleG);
-+         b = shuffleComponent(b, 31, shuffleB);
-+
-+         unsigned r16 = (r & SK_R16_MASK) << SK_R16_SHIFT;
-+         unsigned g16 = (g & SK_G16_MASK) << SK_G16_SHIFT;
-+         unsigned b16 = (b & SK_B16_MASK) << SK_B16_SHIFT;
-+
-+         *pixel = r16 | g16 | b16;
-+      }
-+      break;
-+      case kARGB_4444_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint16_t, addr, fRowBytes, x, y);
-+         auto a = SkGetPackedA4444(*pixel), r = SkGetPackedR4444(*pixel), g = SkGetPackedG4444(*pixel), b = SkGetPackedB4444(*pixel);
-+
-+         r = shuffleComponent(r, 15, shuffleR);
-+         g = shuffleComponent(g, 15, shuffleG);
-+         b = shuffleComponent(b, 15, shuffleB);
-+         // alpha is left unchanged
-+
-+         unsigned a4 = (a & 0xF) << SK_A4444_SHIFT;
-+         unsigned r4 = (r & 0xF) << SK_R4444_SHIFT;
-+         unsigned g4 = (g & 0xF) << SK_G4444_SHIFT;
-+         unsigned b4 = (b & 0xF) << SK_B4444_SHIFT;
-+
-+         *pixel = r4 | b4 | g4 | a4;
-+      }
-+      break;
-+      case kRGBA_8888_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint32_t, addr, fRowBytes, x, y);
-+         auto a = SkGetPackedA32(*pixel), r = SkGetPackedR32(*pixel), g = SkGetPackedG32(*pixel), b = SkGetPackedB32(*pixel);
-+
-+         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
-+         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
-+         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
-+         // alpha is left unchanged
-+
-+         *pixel = (a << SK_A32_SHIFT) | (r << SK_R32_SHIFT) |
-+                  (g << SK_G32_SHIFT) | (b << SK_B32_SHIFT);
-+      }
-+      break;
-+      case kBGRA_8888_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint32_t, addr, fRowBytes, x, y);
-+         auto a = SkGetPackedA32(*pixel), b = SkGetPackedR32(*pixel), g = SkGetPackedG32(*pixel), r = SkGetPackedB32(*pixel);
-+
-+         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
-+         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
-+         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
-+         // alpha is left unchanged
-+
-+         *pixel = (a << SK_BGRA_A32_SHIFT) | (r << SK_BGRA_R32_SHIFT) |
-+                  (g << SK_BGRA_G32_SHIFT) | (b << SK_BGRA_B32_SHIFT);
-+      }
-+      break;
-+      default:
-+         // the remaining formats are not expected to be used in Chromium
-+         LOG(WARNING) << "BRM: ShuffleSubchannelColorData(): Ignoring pixel format";
-+         return;
-+    }
-+
-+    // keep bisecting or reset current width/height as needed
-+    if (x == 0) {
-+       currentW = w;
-+    } else {
-+       currentW = x;
-+    }
-+    if (y == 0) {
-+       currentH = h;
-+    } else {
-+       currentH = y;
-+    }
-+  }
-+}
-+
-+#undef writable_addr
-+#undef shuffleComponent
-+
- }  // namespace blink
---- third_party/blink/renderer/platform/graphics/static_bitmap_image.h.orig
-+++ third_party/blink/renderer/platform/graphics/static_bitmap_image.h
-@@ -36,6 +36,8 @@ class PLATFORM_EXPORT StaticBitmapImage
- 
-   StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {}
- 
-+  static void ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY);
-+
-   bool IsStaticBitmapImage() const override { return true; }
- 
-   // Methods overridden by all sub-classes
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig
-+++ third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1082,6 +1082,9 @@
-       name: "FingerprintingCanvasMeasureTextNoise",
-     },
-     {
-+      name: "FingerprintingCanvasImageDataNoise",
-+    },
-+    {
-       name: "FocuslessSpatialNavigation",
-       settable_from_internals: true,
-     },
diff --git a/www/chromium-uc/patches/extra/bromite/flag-max-connections-per-host.patch b/www/chromium-uc/patches/extra/bromite/flag-max-connections-per-host.patch
deleted file mode 100644
index 65b1887..0000000
--- a/www/chromium-uc/patches/extra/bromite/flag-max-connections-per-host.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 8 Jul 2018 22:42:04 +0200
-Subject: Add flag to configure maximum connections per host
-
-With the introduction of this flag it is possible to increase the maximum
-allowed connections per host; this can however be detrimental to devices
-with limited CPU/memory resources and it is disabled by default.
----
- chrome/browser/about_flags.cc                            |  8 ++++++++
- chrome/browser/flag_descriptions.cc                      |  4 ++++
- chrome/browser/flag_descriptions.h                       |  3 +++
- .../common/network_features.cc                           |  3 +++
- .../common/network_features.h                            |  4 ++++
- .../common/network_switch_list.h                         |  4 ++++
- net/socket/client_socket_pool_manager.cc                 | 16 ++++++++++++++++
- 7 files changed, 42 insertions(+)
-
---- chrome/browser/BUILD.gn.orig
-+++ chrome/browser/BUILD.gn
-@@ -2126,6 +2126,7 @@ static_library("browser") {
-     "//components/net_log",
-     "//components/network_hints/common:mojo_bindings",
-     "//components/network_session_configurator/browser",
-+    "//components/network_session_configurator/common",
-     "//components/network_time",
-     "//components/no_state_prefetch/browser",
-     "//components/no_state_prefetch/common",
---- chrome/browser/bromite_flag_choices.h.orig
-+++ chrome/browser/bromite_flag_choices.h
-@@ -4,4 +4,8 @@
- 
- #ifndef CHROME_BROWSER_BROMITE_FLAG_CHOICES_H_
- #define CHROME_BROWSER_BROMITE_FLAG_CHOICES_H_
-+const FeatureEntry::Choice kMaxConnectionsPerHostChoices[] = {
-+    {features::kMaxConnectionsPerHostChoiceDefault, "", ""},
-+    {features::kMaxConnectionsPerHostChoice15, switches::kMaxConnectionsPerHost, "15"},
-+};
- #endif  // CHROME_BROWSER_BROMITE_FLAG_CHOICES_H_
---- chrome/browser/bromite_flag_entries.h.orig
-+++ chrome/browser/bromite_flag_entries.h
-@@ -12,4 +12,8 @@
-      "Enable Canvas::measureText() fingerprint deception",
-      "Scale the output values of Canvas::measureText() with a randomly selected factor in the range -0.0003% to 0.0003%, which are recomputed on every document initialization.  ungoogled-chromium flag, Bromite feature.",
-      kOsAll, SINGLE_VALUE_TYPE(switches::kFingerprintingCanvasMeasureTextNoise)},
-+    {"max-connections-per-host",
-+     flag_descriptions::kMaxConnectionsPerHostName,
-+     flag_descriptions::kMaxConnectionsPerHostDescription,
-+     kOsAll, MULTI_VALUE_TYPE(kMaxConnectionsPerHostChoices)},
- #endif  // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
---- chrome/browser/browser_process_impl.cc.orig
-+++ chrome/browser/browser_process_impl.cc
-@@ -19,12 +19,14 @@
- #include "base/debug/leak_annotations.h"
- #include "base/files/file_path.h"
- #include "base/location.h"
-+#include "base/logging.h"
- #include "base/macros.h"
- #include "base/memory/ptr_util.h"
- #include "base/metrics/histogram_macros.h"
- #include "base/path_service.h"
- #include "base/run_loop.h"
- #include "base/single_thread_task_runner.h"
-+#include "base/strings/string_number_conversions.h"
- #include "base/synchronization/waitable_event.h"
- #include "base/task/task_traits.h"
- #include "base/task/thread_pool.h"
-@@ -103,6 +105,7 @@
- #include "components/metrics/metrics_service.h"
- #include "components/metrics_services_manager/metrics_services_manager.h"
- #include "components/metrics_services_manager/metrics_services_manager_client.h"
-+#include "components/network_session_configurator/common/network_switches.h"
- #include "components/network_time/network_time_tracker.h"
- #include "components/permissions/permissions_client.h"
- #include "components/policy/core/common/policy_service.h"
-@@ -135,6 +138,7 @@
- #include "media/media_buildflags.h"
- #include "mojo/public/cpp/bindings/pending_receiver.h"
- #include "net/log/net_log.h"
-+#include "net/socket/client_socket_pool_manager.h"
- #include "ppapi/buildflags/buildflags.h"
- #include "printing/buildflags/buildflags.h"
- #include "services/network/public/cpp/features.h"
-@@ -345,6 +349,18 @@ void BrowserProcessImpl::Init() {
-                              base::BindRepeating(&ApplyMetricsReportingPolicy));
- #endif
- 
-+  int max_connections_per_host = 0;
-+  auto switch_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-+      switches::kMaxConnectionsPerHost);
-+  if (!switch_value.empty() && !base::StringToInt(switch_value, &max_connections_per_host)) {
-+    LOG(DFATAL) << "--" << switches::kMaxConnectionsPerHost
-+      << " expected integer; got (\"" << switch_value << "\" instead)";
-+  }
-+  if (max_connections_per_host != 0) {
-+    net::ClientSocketPoolManager::set_max_sockets_per_group(
-+        net::HttpNetworkSession::NORMAL_SOCKET_POOL, max_connections_per_host);
-+  }
-+
-   DCHECK(!webrtc_event_log_manager_);
-   webrtc_event_log_manager_ = WebRtcEventLogManager::CreateSingletonInstance();
- 
---- chrome/browser/flag_descriptions.cc.orig
-+++ chrome/browser/flag_descriptions.cc
-@@ -1621,6 +1621,10 @@ const char kMediaHistoryDescription[] =
-     "Enables Media History which records data around media playbacks on "
-     "websites.";
- 
-+const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
-+const char kMaxConnectionsPerHostDescription[] =
-+     "Customize maximum allowed connections per host.  ungoogled-chromium flag, Bromite feature.";
-+
- const char kMediaRouterCastAllowAllIPsName[] =
-     "Connect to Cast devices on all IP addresses";
- const char kMediaRouterCastAllowAllIPsDescription[] =
---- chrome/browser/flag_descriptions.h.orig
-+++ chrome/browser/flag_descriptions.h
-@@ -930,6 +930,9 @@ extern const char kLogJsConsoleMessagesD
- extern const char kMediaHistoryName[];
- extern const char kMediaHistoryDescription[];
- 
-+extern const char kMaxConnectionsPerHostName[];
-+extern const char kMaxConnectionsPerHostDescription[];
-+
- extern const char kMediaRouterCastAllowAllIPsName[];
- extern const char kMediaRouterCastAllowAllIPsDescription[];
- 
---- components/network_session_configurator/common/network_features.cc.orig
-+++ components/network_session_configurator/common/network_features.cc
-@@ -8,4 +8,7 @@
- 
- namespace features {
- 
-+const char kMaxConnectionsPerHostChoiceDefault[] = "6",
-+                 kMaxConnectionsPerHostChoice15[] = "15";
-+
- }  // namespace features
---- components/network_session_configurator/common/network_features.h.orig
-+++ components/network_session_configurator/common/network_features.h
-@@ -10,6 +10,10 @@
- 
- namespace features {
- 
-+NETWORK_SESSION_CONFIGURATOR_EXPORT extern const char kMaxConnectionsPerHostChoiceDefault[],
-+                 kMaxConnectionsPerHostChoice6[],
-+                 kMaxConnectionsPerHostChoice15[];
-+
- }  // namespace features
- 
- #endif  // COMPONENTS_NETWORK_SESSION_CONFIGURATOR_COMMON_NETWORK_FEATURES_H_
---- components/network_session_configurator/common/network_switch_list.h.orig
-+++ components/network_session_configurator/common/network_switch_list.h
-@@ -19,6 +19,10 @@ NETWORK_SWITCH(kEnableUserAlternateProto
- // Enables the QUIC protocol.  This is a temporary testing flag.
- NETWORK_SWITCH(kEnableQuic, "enable-quic")
- 
-+// Allows specifying a higher number of maximum connections per host
-+// (15 instead of 6, mirroring the value Mozilla uses).
-+NETWORK_SWITCH(kMaxConnectionsPerHost, "max-connections-per-host")
-+
- // Ignores certificate-related errors.
- NETWORK_SWITCH(kIgnoreCertificateErrors, "ignore-certificate-errors")
- 
diff --git a/www/chromium-uc/patches/extra/debian/disable/google-api-warning.patch b/www/chromium-uc/patches/extra/debian/disable/google-api-warning.patch
deleted file mode 100644
index 1c9d44b..0000000
--- a/www/chromium-uc/patches/extra/debian/disable/google-api-warning.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-description: disable the google api key warning when those aren't found
-author: Michael Gilbert <mgilbert@debian.org>
-
---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig
-+++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -672,9 +672,6 @@ void StartupBrowserCreatorImpl::AddInfoB
-     infobars::ContentInfoBarManager* infobar_manager =
-         infobars::ContentInfoBarManager::FromWebContents(web_contents);
- 
--    if (!google_apis::HasAPIKeyConfigured())
--      GoogleApiKeysInfoBarDelegate::Create(infobar_manager);
--
-     if (ObsoleteSystem::IsObsoleteNowOrSoon()) {
-       PrefService* local_state = g_browser_process->local_state();
-       if (!local_state ||
diff --git a/www/chromium-uc/patches/extra/debian/disable/welcome-page.patch b/www/chromium-uc/patches/extra/debian/disable/welcome-page.patch
deleted file mode 100644
index 873aeae..0000000
--- a/www/chromium-uc/patches/extra/debian/disable/welcome-page.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-description: do not override the welcome page setting set in master_preferences
-author: Michael Gilbert <mgilbert@debian.org>
-bug-debian: http://bugs.debian.org/857767
-
---- chrome/browser/profiles/profile_manager.cc.orig
-+++ chrome/browser/profiles/profile_manager.cc
-@@ -1310,7 +1310,7 @@ void ProfileManager::InitProfileUserPref
-     profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
-                                    supervised_user_id);
-   }
--#if !defined(OS_ANDROID)
-+#if 0
-   // TODO(pmonette): Fix IsNewProfile() to handle the case where the profile is
-   // new even if the "Preferences" file already existed. (For example: The
-   // master_preferences file is dumped into the default profile on first run,
diff --git a/www/chromium-uc/patches/extra/debian/fixes/connection-message.patch b/www/chromium-uc/patches/extra/debian/fixes/connection-message.patch
deleted file mode 100644
index d9aaa94..0000000
--- a/www/chromium-uc/patches/extra/debian/fixes/connection-message.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-description: suggest proxy misconfiguration when network is unreachable
-author: Michael Gilbert <mgilbert@debian.org>
-bug-debian: http://bugs.debian.org/864539
-
---- components/error_page_strings.grdp.orig
-+++ components/error_page_strings.grdp
-@@ -54,7 +54,7 @@
-   </message>
-   <message name="IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_BODY" desc="When a page fails to load, sometimes we suggest checking the network connections.  This contains details below the suggestion.">
-     Check any cables and reboot any routers, modems, or other network
--    devices you may be using.
-+    devices you may be using. Also check that any proxy server currently in use is reachable and configured correctly.
-   </message>
-   <if expr="not is_ios">
-     <message name="IDS_ERRORPAGES_SUGGESTION_SECURE_DNS_CONFIG_HEADER" desc="When a page fails to load, sometimes we suggest checking the secure DNS configuration.  This is a header above above some details.">
diff --git a/www/chromium-uc/patches/extra/debian/gn/parallel.patch b/www/chromium-uc/patches/extra/debian/gn/parallel.patch
deleted file mode 100644
index ac0a2b0..0000000
--- a/www/chromium-uc/patches/extra/debian/gn/parallel.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-description: respect specified number of parallel jobs while bootstrapping gn
-author: Michael Gilbert <mgilbert@debian.org>
-
---- tools/gn/bootstrap/bootstrap.py.orig
-+++ tools/gn/bootstrap/bootstrap.py
-@@ -47,6 +47,7 @@ def main(argv):
-       help='The directory in which to build gn, '
-       'relative to the src directory. (eg. out/Release)')
-   parser.add_option('-v', '--verbose', help='ignored')
-+  parser.add_option('-j', '--jobs', help='Number of jobs')
-   parser.add_option(
-       '--skip-generate-buildfiles',
-       action='store_true',
-@@ -121,8 +122,12 @@ def main(argv):
- 
-   shutil.copy2(
-       os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir)
--  subprocess.check_call(
--      [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn'])
-+  if options.jobs:
-+    subprocess.check_call(
-+        [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', '-j'+str(options.jobs), 'gn'])
-+  else:
-+    subprocess.check_call(
-+        [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn'])
-   shutil.copy2(os.path.join(gn_build_dir, 'gn'), gn_path)
- 
-   if not options.skip_generate_buildfiles:
diff --git a/www/chromium-uc/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/www/chromium-uc/patches/extra/inox-patchset/0006-modify-default-prefs.patch
deleted file mode 100644
index d62ef29..0000000
--- a/www/chromium-uc/patches/extra/inox-patchset/0006-modify-default-prefs.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-
---- chrome/browser/background/background_mode_manager.cc.orig
-+++ chrome/browser/background/background_mode_manager.cc
-@@ -376,7 +376,7 @@ void BackgroundModeManager::RegisterPref
-   registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
-   registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
- #endif
--  registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true);
-+  registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false);
- }
- 
- void BackgroundModeManager::RegisterProfile(Profile* profile) {
---- chrome/browser/chrome_content_browser_client.cc.orig
-+++ chrome/browser/chrome_content_browser_client.cc
-@@ -1238,7 +1238,7 @@ void ChromeContentBrowserClient::Registe
- void ChromeContentBrowserClient::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
--  registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, true);
-+  registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, false);
-   // Register user prefs for mapping SitePerProcess and IsolateOrigins in
-   // user policy in addition to the same named ones in Local State (which are
-   // used for mapping the command-line flags).
---- chrome/browser/net/prediction_options.cc.orig
-+++ chrome/browser/net/prediction_options.cc
-@@ -31,7 +31,7 @@ NetworkPredictionStatus CanPrefetchAndPr
-       }
-       return NetworkPredictionStatus::DISABLED_DUE_TO_NETWORK;
-     default:
--      DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options);
-+      //DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options);
-       return NetworkPredictionStatus::DISABLED_ALWAYS;
-   }
- }
---- chrome/browser/net/prediction_options.h.orig
-+++ chrome/browser/net/prediction_options.h
-@@ -22,7 +22,7 @@ enum NetworkPredictionOptions {
-   NETWORK_PREDICTION_ALWAYS,
-   NETWORK_PREDICTION_WIFI_ONLY,
-   NETWORK_PREDICTION_NEVER,
--  NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_WIFI_ONLY,
-+  NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_NEVER,
- };
- 
- enum class NetworkPredictionStatus {
---- chrome/browser/net/profile_network_context_service.cc.orig
-+++ chrome/browser/net/profile_network_context_service.cc
-@@ -319,7 +319,7 @@ void ProfileNetworkContextService::Updat
- void ProfileNetworkContextService::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
--      embedder_support::kAlternateErrorPagesEnabled, true,
-+      embedder_support::kAlternateErrorPagesEnabled, false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterBooleanPref(prefs::kQuicAllowed, true);
-   registry->RegisterBooleanPref(prefs::kGloballyScopeHTTPAuthCacheEnabled,
---- chrome/browser/profiles/profile.cc.orig
-+++ chrome/browser/profiles/profile.cc
-@@ -276,7 +276,7 @@ const char Profile::kProfileKey[] = "__P
- void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
-       prefs::kSearchSuggestEnabled,
--      true,
-+      false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- #if defined(OS_ANDROID)
-   registry->RegisterStringPref(
---- chrome/browser/resources/settings/reset_page/reset_profile_dialog.html.orig
-+++ chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
-@@ -36,7 +36,7 @@
-         </cr-button>
-       </div>
-       <div slot="footer">
--        <cr-checkbox id="sendSettings" checked>
-+        <cr-checkbox id="sendSettings">
-           $i18nRaw{resetPageFeedback}</cr-checkbox>
-       </div>
-     </cr-dialog>
---- chrome/browser/signin/account_consistency_mode_manager.cc.orig
-+++ chrome/browser/signin/account_consistency_mode_manager.cc
-@@ -111,7 +111,7 @@ AccountConsistencyModeManager::~AccountC
- // static
- void AccountConsistencyModeManager::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
--  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, true);
-+  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, false);
- }
- 
- // static
---- chrome/browser/ui/browser_ui_prefs.cc.orig
-+++ chrome/browser/ui/browser_ui_prefs.cc
-@@ -77,11 +77,11 @@ void RegisterBrowserUserPrefs(user_prefs
-   registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
-   registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
-   registry->RegisterBooleanPref(
--      translate::prefs::kOfferTranslateEnabled, true,
-+      translate::prefs::kOfferTranslateEnabled, false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string());
-   registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
--  registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, true);
-+  registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, false);
-   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
-   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
-   registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);
---- chrome/service/cloud_print/connector_settings.cc.orig
-+++ chrome/service/cloud_print/connector_settings.cc
-@@ -59,7 +59,7 @@ void ConnectorSettings::InitFrom(Service
-   DCHECK(server_url_.is_valid());
- 
-   connect_new_printers_ = prefs->GetBoolean(
--      prefs::kCloudPrintConnectNewPrinters, true);
-+      prefs::kCloudPrintConnectNewPrinters, false);
- 
-   xmpp_ping_enabled_ = prefs->GetBoolean(
-       prefs::kCloudPrintXmppPingEnabled, false);
---- components/autofill/core/common/autofill_prefs.cc.orig
-+++ components/autofill/core/common/autofill_prefs.cc
-@@ -131,10 +131,10 @@ const char kAutocompleteLastVersionReten
- void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
-   // Synced prefs. Used for cross-device choices, e.g., credit card Autofill.
-   registry->RegisterBooleanPref(
--      prefs::kAutofillEnabledDeprecated, true,
-+      prefs::kAutofillEnabledDeprecated, false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterBooleanPref(
--      prefs::kAutofillProfileEnabled, true,
-+      prefs::kAutofillProfileEnabled, false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterIntegerPref(
-       prefs::kAutofillLastVersionDeduped, 0,
-@@ -147,7 +147,7 @@ void RegisterProfilePrefs(user_prefs::Pr
-       prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterBooleanPref(
--      prefs::kAutofillCreditCardEnabled, true,
-+      prefs::kAutofillCreditCardEnabled, false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterStringPref(
-       prefs::kAutofillProfileValidity, "",
---- components/bookmarks/browser/bookmark_utils.cc.orig
-+++ components/bookmarks/browser/bookmark_utils.cc
-@@ -437,7 +437,7 @@ bool DoesBookmarkContainWords(const std:
- void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
-       prefs::kShowBookmarkBar,
--      false,
-+      true,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterBooleanPref(prefs::kEditBookmarksEnabled, true);
-   registry->RegisterBooleanPref(
---- components/bookmarks/browser/features.cc.orig
-+++ components/bookmarks/browser/features.cc
-@@ -10,7 +10,7 @@ namespace features {
- // Changes the apps shortcut on the bookmarks bar to default to off.
- // https://crbug.com/1236793
- const base::Feature kAppsShortcutDefaultOff{"AppsShortcutDefaultOff",
--                                            base::FEATURE_DISABLED_BY_DEFAULT};
-+                                            base::FEATURE_ENABLED_BY_DEFAULT};
- 
- }  // namespace features
- }  // namespace bookmarks
---- components/content_settings/core/browser/cookie_settings.cc.orig
-+++ components/content_settings/core/browser/cookie_settings.cc
-@@ -63,7 +63,7 @@ void CookieSettings::RegisterProfilePref
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterIntegerPref(
-       prefs::kCookieControlsMode,
--      static_cast<int>(CookieControlsMode::kIncognitoOnly),
-+      static_cast<int>(CookieControlsMode::kBlockThirdParty),
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- }
- 
---- components/password_manager/core/browser/password_manager.cc.orig
-+++ components/password_manager/core/browser/password_manager.cc
-@@ -204,10 +204,10 @@ bool HasMutedCredentials(base::span<cons
- void PasswordManager::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
--      prefs::kCredentialsEnableService, true,
-+      prefs::kCredentialsEnableService, false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
-   registry->RegisterBooleanPref(
--      prefs::kCredentialsEnableAutosignin, true,
-+      prefs::kCredentialsEnableAutosignin, false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
-   registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(),
-                                PrefRegistry::NO_REGISTRATION_FLAGS);
---- components/payments/core/payment_prefs.cc.orig
-+++ components/payments/core/payment_prefs.cc
-@@ -16,7 +16,7 @@ const char kCanMakePaymentEnabled[] = "p
- void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(kPaymentsFirstTransactionCompleted, false);
-   registry->RegisterBooleanPref(
--      kCanMakePaymentEnabled, true,
-+      kCanMakePaymentEnabled, false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- }
- 
diff --git a/www/chromium-uc/patches/extra/inox-patchset/0008-restore-classic-ntp.patch b/www/chromium-uc/patches/extra/inox-patchset/0008-restore-classic-ntp.patch
deleted file mode 100644
index 9d21b6f..0000000
--- a/www/chromium-uc/patches/extra/inox-patchset/0008-restore-classic-ntp.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- chrome/browser/search/search.cc.orig
-+++ chrome/browser/search/search.cc
-@@ -182,26 +182,7 @@ struct NewTabURLDetails {
-                              : chrome::kChromeUINewTabPageThirdPartyURL);
- #endif
- 
--    if (ShouldShowLocalNewTab(profile))
--      return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);
--
--    const TemplateURL* template_url =
--        GetDefaultSearchProviderTemplateURL(profile);
--    if (!profile || !template_url)
--      return NewTabURLDetails(local_url, NEW_TAB_URL_BAD);
--
--    GURL search_provider_url(template_url->new_tab_url_ref().ReplaceSearchTerms(
--        TemplateURLRef::SearchTermsArgs(std::u16string()),
--        UIThreadSearchTermsData()));
--
--    if (!search_provider_url.is_valid())
--      return NewTabURLDetails(local_url, NEW_TAB_URL_NOT_SET);
--    if (!search_provider_url.SchemeIsCryptographic())
--      return NewTabURLDetails(local_url, NEW_TAB_URL_INSECURE);
--    if (!IsURLAllowedForSupervisedUser(search_provider_url, profile))
--      return NewTabURLDetails(local_url, NEW_TAB_URL_BLOCKED);
--
--    return NewTabURLDetails(search_provider_url, NEW_TAB_URL_VALID);
-+    return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);
-   }
- 
-   const GURL url;
---- components/ntp_snippets/features.cc.orig
-+++ components/ntp_snippets/features.cc
-@@ -39,7 +39,7 @@ const base::Feature* const kAllFeatures[
-     &kOptionalImagesEnabledFeature};
- 
- const base::Feature kArticleSuggestionsFeature{
--    "NTPArticleSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "NTPArticleSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kRemoteSuggestionsEmulateM58FetchingSchedule{
-     "RemoteSuggestionsEmulateM58FetchingSchedule",
-@@ -69,10 +69,10 @@ const char kNotificationsDailyLimit[] =
- const char kNotificationsIgnoredLimitParam[] = "ignored_limit";
- 
- const base::Feature kKeepPrefetchedContentSuggestions{
--    "KeepPrefetchedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "KeepPrefetchedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kOptionalImagesEnabledFeature{
--    "NTPRemoteSuggestionsOptionalImages", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "NTPRemoteSuggestionsOptionalImages", base::FEATURE_DISABLED_BY_DEFAULT};
- 
- std::vector<const base::Feature*> GetAllFeatures() {
-   // Skip the last feature as it's a nullptr.
diff --git a/www/chromium-uc/patches/extra/inox-patchset/0013-disable-missing-key-warning.patch b/www/chromium-uc/patches/extra/inox-patchset/0013-disable-missing-key-warning.patch
deleted file mode 100644
index 0b14cd8..0000000
--- a/www/chromium-uc/patches/extra/inox-patchset/0013-disable-missing-key-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc.orig
-+++ chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
-@@ -17,9 +17,6 @@
- // static
- void GoogleApiKeysInfoBarDelegate::Create(
-     infobars::ContentInfoBarManager* infobar_manager) {
--  infobar_manager->AddInfoBar(
--      CreateConfirmInfoBar(std::unique_ptr<ConfirmInfoBarDelegate>(
--          new GoogleApiKeysInfoBarDelegate())));
- }
- 
- GoogleApiKeysInfoBarDelegate::GoogleApiKeysInfoBarDelegate()
diff --git a/www/chromium-uc/patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch b/www/chromium-uc/patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch
deleted file mode 100644
index ff72a53..0000000
--- a/www/chromium-uc/patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- sandbox/linux/BUILD.gn.orig
-+++ sandbox/linux/BUILD.gn
-@@ -327,6 +327,12 @@ if (is_linux || is_chromeos) {
-       # These files have a suspicious comparison.
-       # TODO fix this and re-enable this warning.
-       "-Wno-sign-compare",
-+
-+      "-fPIE",
-+    ]
-+
-+    ldflags = [
-+      "-pie",
-     ]
-   }
- }
diff --git a/www/chromium-uc/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch b/www/chromium-uc/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch
deleted file mode 100644
index 4790f65..0000000
--- a/www/chromium-uc/patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/startup/startup_tab_provider.cc.orig
-+++ chrome/browser/ui/startup/startup_tab_provider.cc
-@@ -105,7 +105,7 @@ bool ValidateUrl(const GURL& url) {
- 
- StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const {
- // Chrome OS has its own welcome flow provided by OOBE.
--#if BUILDFLAG(IS_CHROMEOS_ASH)
-+#if 1
-   return StartupTabs();
- #else
-   if (!profile)
diff --git a/www/chromium-uc/patches/extra/inox-patchset/0019-disable-battery-status-service.patch b/www/chromium-uc/patches/extra/inox-patchset/0019-disable-battery-status-service.patch
deleted file mode 100644
index ded3df9..0000000
--- a/www/chromium-uc/patches/extra/inox-patchset/0019-disable-battery-status-service.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- services/device/battery/battery_status_service.cc.orig
-+++ services/device/battery/battery_status_service.cc
-@@ -22,10 +22,7 @@ BatteryStatusService::BatteryStatusServi
-       update_callback_(
-           base::BindRepeating(&BatteryStatusService::NotifyConsumers,
-                               base::Unretained(this))),
--      status_updated_(false),
-       is_shutdown_(false) {
--  callback_list_.set_removal_callback(base::BindRepeating(
--      &BatteryStatusService::ConsumersChanged, base::Unretained(this)));
- }
- 
- BatteryStatusService::~BatteryStatusService() = default;
-@@ -40,58 +37,16 @@ base::CallbackListSubscription BatterySt
-   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
-   DCHECK(!is_shutdown_);
- 
--  if (!battery_fetcher_)
--    battery_fetcher_ = BatteryStatusManager::Create(update_callback_);
--
--  if (callback_list_.empty()) {
--    bool success = battery_fetcher_->StartListeningBatteryChange();
--    // On failure pass the default values back.
--    if (!success)
--      callback.Run(mojom::BatteryStatus());
--  }
--
--  if (status_updated_) {
--    // Send recent status to the new callback if already available.
--    callback.Run(status_);
--  }
-+  // Always pass the default values.
-+  callback.Run(mojom::BatteryStatus());
- 
-   return callback_list_.Add(callback);
- }
- 
--void BatteryStatusService::ConsumersChanged() {
--  if (is_shutdown_)
--    return;
--
--  if (callback_list_.empty()) {
--    battery_fetcher_->StopListeningBatteryChange();
--    status_updated_ = false;
--  }
--}
--
- void BatteryStatusService::NotifyConsumers(const mojom::BatteryStatus& status) {
--  DCHECK(!is_shutdown_);
--
--  main_thread_task_runner_->PostTask(
--      FROM_HERE,
--      base::BindOnce(&BatteryStatusService::NotifyConsumersOnMainThread,
--                     base::Unretained(this), status));
--}
--
--void BatteryStatusService::NotifyConsumersOnMainThread(
--    const mojom::BatteryStatus& status) {
--  DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
--  if (callback_list_.empty())
--    return;
--
--  status_ = status;
--  status_updated_ = true;
--  callback_list_.Notify(status_);
- }
- 
- void BatteryStatusService::Shutdown() {
--  if (!callback_list_.empty())
--    battery_fetcher_->StopListeningBatteryChange();
--  battery_fetcher_.reset();
-   is_shutdown_ = true;
- }
- 
-@@ -102,9 +57,6 @@ BatteryStatusService::GetUpdateCallbackF
- 
- void BatteryStatusService::SetBatteryManagerForTesting(
-     std::unique_ptr<BatteryStatusManager> test_battery_manager) {
--  battery_fetcher_ = std::move(test_battery_manager);
--  status_ = mojom::BatteryStatus();
--  status_updated_ = false;
-   is_shutdown_ = false;
-   main_thread_task_runner_ = base::ThreadTaskRunnerHandle::Get();
- }
---- services/device/battery/battery_status_service.h.orig
-+++ services/device/battery/battery_status_service.h
-@@ -60,15 +60,10 @@ class BatteryStatusService {
-   // Updates current battery status and sends new status to interested
-   // render processes. Can be called on any thread via a callback.
-   void NotifyConsumers(const mojom::BatteryStatus& status);
--  void NotifyConsumersOnMainThread(const mojom::BatteryStatus& status);
--  void ConsumersChanged();
- 
-   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
--  std::unique_ptr<BatteryStatusManager> battery_fetcher_;
-   BatteryUpdateCallbackList callback_list_;
-   BatteryUpdateCallback update_callback_;
--  mojom::BatteryStatus status_;
--  bool status_updated_;
-   bool is_shutdown_;
- };
- 
diff --git a/www/chromium-uc/patches/extra/iridium-browser/Remove-EV-certificates.patch b/www/chromium-uc/patches/extra/iridium-browser/Remove-EV-certificates.patch
deleted file mode 100644
index 8f794fe..0000000
--- a/www/chromium-uc/patches/extra/iridium-browser/Remove-EV-certificates.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d32e222a2706cb59f9855b9cf4330f88d1af5435 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Thu, 2 Apr 2015 12:44:23 +0200
-Subject: [PATCH 41/66] Remove EV certificates
-
-The team chose to let EV certificates appear just like normal
-certificates. The web of trust is considered a failure in itself, so
-do not give users a false sense of extra security with EV certs.
-Instead, let them appear just like regular ones.
----
- net/cert/ev_root_ca_metadata.cc | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
---- net/cert/ev_root_ca_metadata.cc.orig
-+++ net/cert/ev_root_ca_metadata.cc
-@@ -41,6 +41,16 @@ struct EVMetadata {
- 
- // These certificates may be found in net/data/ssl/ev_roots.
- static const EVMetadata kEvRootCaMetadata[] = {
-+    // need some dummy thing to make compiler happy, because
-+    // arraysize() is implemented as a convoluted template rather than
-+    // the traditional sizeof(x)/sizeof(*x)
-+    { { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-+          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } },
-+      {
-+        "0",
-+      }
-+    },
-+#if 0
-     // AC Camerfirma S.A. Chambers of Commerce Root - 2008
-     // https://www.camerfirma.com
-     {
-@@ -590,7 +600,9 @@ static const EVMetadata kEvRootCaMetadat
-           0xd2, 0x09, 0xb7, 0x37, 0xcb, 0xe2, 0xc1, 0x8c, 0xfb, 0x2c, 0x10,
-           0xc0, 0xff, 0x0b, 0xcf, 0x0d, 0x32, 0x86, 0xfc, 0x1a, 0xa2}},
-         {"2.16.840.1.114404.1.1.2.4.1", ""},
--    }};
-+    }
-+#endif
-+};
- 
- #endif  // defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
- }  // namespace
diff --git a/www/chromium-uc/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch b/www/chromium-uc/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
deleted file mode 100644
index 0072e8f..0000000
--- a/www/chromium-uc/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 7134d5fd762237ad2d80093b68ccbd1582476640 Mon Sep 17 00:00:00 2001
-From: Joachim Bauch <jojo@struktur.de>
-Date: Thu, 25 Jun 2015 15:51:59 +0200
-Subject: [PATCH 56/66] browser: disable profile auto-import on first run
-
----
- chrome/browser/chrome_browser_main.cc | 2 --
- 1 file changed, 2 deletions(-)
-
---- chrome/browser/chrome_browser_main.cc.orig
-+++ chrome/browser/chrome_browser_main.cc
-@@ -1492,8 +1492,6 @@ int ChromeBrowserMainParts::PreMainMessa
-   // and preferences have been registered since some of the import code depends
-   // on preferences.
-   if (first_run::IsChromeFirstRun()) {
--    first_run::AutoImport(profile_, master_prefs_->import_bookmarks_path);
--
-     // Note: This can pop-up the first run consent dialog on Linux & Mac.
-     first_run::DoPostImportTasks(profile_,
-                                  master_prefs_->make_chrome_default_for_user);
diff --git a/www/chromium-uc/patches/extra/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch b/www/chromium-uc/patches/extra/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
deleted file mode 100644
index a6eab74..0000000
--- a/www/chromium-uc/patches/extra/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From d3dcad96b3c2091026c3a81054bb3ce56538a702 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Thu, 29 Jan 2015 10:46:40 +0100
-Subject: [PATCH 16/66] mime_util: force text/x-suse-ymp to be downloaded
-
-YMP files (YaST One Click Install) are plaintext XML, but also not
-very interesting in themselves. Force them to be stored.
----
- components/mime_util/mime_util.cc | 1 +
- 1 file changed, 1 insertion(+)
-
---- third_party/blink/common/mime_util/mime_util.cc.orig
-+++ third_party/blink/common/mime_util/mime_util.cc
-@@ -83,6 +83,7 @@ static const char* const kUnsupportedTex
-     "text/x-csv",
-     "text/x-vcf",
-     "text/rtf",
-+    "text/x-suse-ymp",
-     "text/comma-separated-values",
-     "text/csv",
-     "text/tab-separated-values",
diff --git a/www/chromium-uc/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch b/www/chromium-uc/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch
deleted file mode 100644
index 394a6da..0000000
--- a/www/chromium-uc/patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 088a50b2fc66418294166b61f31925426b1a9c54 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Mon, 15 Sep 2014 10:52:32 +0200
-Subject: [PATCH 12/66] net/cert: increase default key length for
- newly-generated RSA keys
-
-Should we add something for chrome://settings, or just leave
-it as hidden as it was before?
----
- net/cert/x509_util.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- net/cert/x509_util.cc.orig
-+++ net/cert/x509_util.cc
-@@ -241,7 +241,7 @@ bool GetTLSServerEndPointChannelBinding(
- }
- 
- // RSA keys created by CreateKeyAndSelfSignedCert will be of this length.
--static const uint16_t kRSAKeyLength = 1024;
-+static const uint16_t kRSAKeyLength = 2048;
- 
- // Certificates made by CreateKeyAndSelfSignedCert will be signed using this
- // digest algorithm.
diff --git a/www/chromium-uc/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch b/www/chromium-uc/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch
deleted file mode 100644
index beb8b0b..0000000
--- a/www/chromium-uc/patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 93010fd16c1c9f01a06eab18055bcab54b028cc8 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Fri, 13 Feb 2015 01:04:21 +0100
-Subject: [PATCH 28/66] prefs: always prompt for download directory by default
-
-If the user opens a link, one of two things might happen. The URI
-resolves to a "web page" and will be displayed, then everything is
-good. Or it has a MIME type like application/* or so that causes the
-browser to consider it a file download instead.
-
-In that case, one of two things might happen. The browser may display
-a dialog box asking explicitly for an action, then everything is
-good. Or it does not and instead readily stores the file on disk.
-
-(Modern browsers also download the file in the background when waiting
-for the dialog box confirmation, but that is a separate tuning knob.)
-
-When the file is chosen to be immediately stored on disk without user
-interaction, the visual feedback for this may be rather miniscule.
-
-And then, you have to open a terminal or file manager again just to
-move the file to the location you wanted it to be in in the first
-place.
-
-TLDR: Do not let files sneak onto the disk too easily.
----
- chrome/browser/download/download_prefs.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- chrome/browser/download/download_prefs.cc.orig
-+++ chrome/browser/download/download_prefs.cc
-@@ -271,7 +271,7 @@ void DownloadPrefs::RegisterProfilePrefs
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
-       prefs::kPromptForDownload,
--      false,
-+      true,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterStringPref(prefs::kDownloadExtensionsToOpen, std::string());
-   registry->RegisterListPref(prefs::kDownloadExtensionsToOpenByPolicy, {});
diff --git a/www/chromium-uc/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch b/www/chromium-uc/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch
deleted file mode 100644
index 01696b7..0000000
--- a/www/chromium-uc/patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 0839326fb1b7ff7937cee0efa45f5a4ba23c2f78 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Sat, 13 Sep 2014 17:25:47 +0200
-Subject: [PATCH 27/66] prefs: only keep cookies until exit
-
-Out with all those tracking cookies!
----
- components/content_settings/core/browser/content_settings_registry.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- components/content_settings/core/browser/content_settings_registry.cc.orig
-+++ components/content_settings/core/browser/content_settings_registry.cc
-@@ -126,7 +126,7 @@ void ContentSettingsRegistry::Init() {
-   // WARNING: The string names of the permissions passed in below are used to
-   // generate preference names and should never be changed!
- 
--  Register(ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_ALLOW,
-+  Register(ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_SESSION_ONLY,
-            WebsiteSettingsInfo::SYNCABLE,
-            AllowlistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
-            ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
diff --git a/www/chromium-uc/patches/extra/iridium-browser/updater-disable-auto-update.patch b/www/chromium-uc/patches/extra/iridium-browser/updater-disable-auto-update.patch
deleted file mode 100644
index a6be904..0000000
--- a/www/chromium-uc/patches/extra/iridium-browser/updater-disable-auto-update.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f97af1715c10c5926169ff317ca7c91f1d073af9 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Fri, 13 Feb 2015 00:59:04 +0100
-Subject: [PATCH 39/66] updater: disable auto-update
-
-As per http://www.chromium.org/administrators/turning-off-auto-updates ,
-the auto update function is decidedly disabled on Linux, i.e.
-the following patch is for Windows and MacOS.
-
-For Windows, all we need is to build without -DGOOGLE_CHROME_BUILD (cf.
-chrome/installer/util/google_update_settings.cc), which may already be
-the case anyway, since we are based off Chromium, not Chrome.
----
- chrome/browser/app_controller_mac.mm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- chrome/browser/app_controller_mac.mm.orig
-+++ chrome/browser/app_controller_mac.mm
-@@ -866,7 +866,7 @@ static base::mac::ScopedObjCClassSwizzle
-   CFStringRef checkInterval = CFSTR("checkInterval");
-   CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
-   if (!plist) {
--    const float fiveHoursInSeconds = 5.0 * 60.0 * 60.0;
-+    const float fiveHoursInSeconds = 0.0;
-     NSNumber* value = [NSNumber numberWithFloat:fiveHoursInSeconds];
-     CFPreferencesSetAppValue(checkInterval, value, app);
-     CFPreferencesAppSynchronize(app);
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-components-ungoogled.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-components-ungoogled.patch
deleted file mode 100644
index 167eaec..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-components-ungoogled.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-# Add ungoogled-chromium-specific code to components/ungoogled/
-
---- /dev/null
-+++ components/ungoogled/BUILD.gn
-@@ -0,0 +1,14 @@
-+# Copyright (c) 2020 The ungoogled-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.
-+
-+component("ungoogled_switches") {
-+  sources = [
-+    "ungoogled_switches.h",
-+    "ungoogled_switches.cc",
-+  ]
-+
-+  defines = [ "IS_UNGOOGLED_IMPL" ]
-+
-+  deps = [ "//base" ]
-+}
---- /dev/null
-+++ components/ungoogled/ungoogled_switches.cc
-@@ -0,0 +1,21 @@
-+// Copyright (c) 2020 The ungoogled-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 "components/ungoogled/ungoogled_switches.h"
-+
-+namespace switches {
-+
-+// Enable fingerprinting deception for getClientRects and getBoundingClientRect
-+const char kFingerprintingClientRectsNoise[] = "fingerprinting-client-rects-noise";
-+
-+// Enable fingerprinting deception for measureText
-+const char kFingerprintingCanvasMeasureTextNoise[] = "fingerprinting-canvas-measuretext-noise";
-+
-+// Enable fingerprinting deception for Canvas image data
-+const char kFingerprintingCanvasImageDataNoise[] = "fingerprinting-canvas-image-data-noise";
-+
-+// Set PDF Plugin name, for websites that analyze JavaScript API navigator.plugins
-+const char kPDFPluginName[] = "pdf-plugin-name";
-+
-+}  // namespace switches
---- /dev/null
-+++ components/ungoogled/ungoogled_switches.h
-@@ -0,0 +1,21 @@
-+// Copyright (c) 2020 The ungoogled-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.
-+
-+// Defines all the fingerprinting command-line switches.
-+
-+#ifndef THIRD_PARTY_UNGOOGLED_FINGERPRINTING_SWITCHES_H_
-+#define THIRD_PARTY_UNGOOGLED_FINGERPRINTING_SWITCHES_H_
-+
-+#include "base/component_export.h"
-+
-+namespace switches {
-+
-+COMPONENT_EXPORT(UNGOOGLED) extern const char kFingerprintingClientRectsNoise[];
-+COMPONENT_EXPORT(UNGOOGLED) extern const char kFingerprintingCanvasMeasureTextNoise[];
-+COMPONENT_EXPORT(UNGOOGLED) extern const char kFingerprintingCanvasImageDataNoise[];
-+COMPONENT_EXPORT(UNGOOGLED) extern const char kPDFPluginName[];
-+
-+}
-+
-+#endif  // THIRD_PARTY_UNGOOGLED_FINGERPRINTING_SWITCHES_H_
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-extra-channel-info.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-extra-channel-info.patch
deleted file mode 100644
index 6df493e..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-extra-channel-info.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-description: change extra channel info to "Ungoogled Chromium"
-author: Wengling Chen <feiyu2817@gmail.com>
-
----
- components/version_ui_strings.grdp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- components/version_ui_strings.grdp.orig
-+++ components/version_ui_strings.grdp
-@@ -4,10 +4,10 @@
-     About Version
-   </message>
-   <message name="IDS_VERSION_UI_OFFICIAL" desc="official build on the about:version page">
--    Official Build
-+    Official Build, ungoogled-chromium
-   </message>
-   <message name="IDS_VERSION_UI_UNOFFICIAL" desc="unofficial build on the about:version page">
--    Developer Build
-+    Developer Build, ungoogled-chromium
-   </message>
-   <message name="IDS_VERSION_UI_32BIT" desc="32-bit on the chrome://version page">
-     (32-bit)
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch
deleted file mode 100644
index 0d622e8..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- chrome/browser/ui/bookmarks/bookmark_tab_helper.cc.orig
-+++ chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
-@@ -4,6 +4,7 @@
- 
- #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
- 
-+#include "base/command_line.h"
- #include "base/observer_list.h"
- #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
-@@ -71,10 +72,12 @@ bool BookmarkTabHelper::ShouldShowBookma
-       !prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar))
-     return false;
- 
-+  const std::string flag_value =
-+    base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("bookmark-bar-ntp");
-   // The bookmark bar is only shown on the NTP if the user
-   // has added something to it.
-   return IsNTP(web_contents()) && bookmark_model_ &&
--         bookmark_model_->HasBookmarks();
-+         bookmark_model_->HasBookmarks() && (flag_value != "never");
- }
- 
- void BookmarkTabHelper::AddObserver(BookmarkTabHelperObserver* observer) {
---- chrome/browser/ungoogled_flag_choices.h.orig
-+++ chrome/browser/ungoogled_flag_choices.h
-@@ -39,4 +39,10 @@ const FeatureEntry::Choice kPDFPluginNam
-     {"Google Chrome", switches::kPDFPluginName, "chrome"},
-     {"Microsoft Edge", switches::kPDFPluginName, "edge"},
- };
-+const FeatureEntry::Choice kBookmarkBarNewTab[] = {
-+    {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-+    {"Never",
-+     "bookmark-bar-ntp",
-+     "never"},
-+};
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -44,4 +44,8 @@
-      "Set internal PDF plugin name",
-      "Sets the internal PDF viewer plugin name. Useful for sites that probe JS API navigator.plugins.  ungoogled-chromium flag.",
-      kOsDesktop, MULTI_VALUE_TYPE(kPDFPluginNameChoices)},
-+    {"bookmark-bar-ntp",
-+     "Bookmark Bar on New-Tab-Page",
-+     "Disable the Bookmark Bar on the New-Tab-Page.  ungoogled-chromium flag.",
-+     kOsDesktop, MULTI_VALUE_TYPE(kBookmarkBarNewTab)},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch
deleted file mode 100644
index 56dc7e2..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch
+++ /dev/null
@@ -1,186 +0,0 @@
---- chrome/browser/ui/browser.cc.orig
-+++ chrome/browser/ui/browser.cc
-@@ -140,6 +140,8 @@
- #include "chrome/browser/ui/tabs/tab_strip_model.h"
- #include "chrome/browser/ui/tabs/tab_utils.h"
- #include "chrome/browser/ui/ui_features.h"
-+#include "chrome/browser/ui/views/frame/browser_view.h"
-+#include "chrome/browser/ui/views/message_box_dialog.h"
- #include "chrome/browser/ui/web_applications/app_browser_controller.h"
- #include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
- #include "chrome/browser/ui/webui/signin/login_ui_service.h"
-@@ -467,6 +469,7 @@ Browser::Browser(const CreateParams& par
-       omit_from_session_restore_(params.omit_from_session_restore),
-       should_trigger_session_restore_(params.should_trigger_session_restore),
-       cancel_download_confirmation_state_(NOT_PROMPTED),
-+      close_multitab_confirmation_state_(NOT_PROMPTED),
-       override_bounds_(params.initial_bounds),
-       initial_show_state_(params.initial_show_state),
-       initial_workspace_(params.initial_workspace),
-@@ -830,7 +833,7 @@ Browser::WarnBeforeClosingResult Browser
-   // If the browser can close right away (there are no pending downloads we need
-   // to prompt about) then there's no need to warn. In the future, we might need
-   // to check other conditions as well.
--  if (CanCloseWithInProgressDownloads())
-+  if (CanCloseWithInProgressDownloads() && CanCloseWithMultipleTabs())
-     return WarnBeforeClosingResult::kOkToClose;
- 
-   DCHECK(!warn_before_closing_callback_)
-@@ -860,6 +863,7 @@ bool Browser::TryToCloseWindow(
- 
- void Browser::ResetTryToCloseWindow() {
-   cancel_download_confirmation_state_ = NOT_PROMPTED;
-+  close_multitab_confirmation_state_ = NOT_PROMPTED;
-   unload_controller_.ResetTryToCloseWindow();
- }
- 
-@@ -2702,6 +2706,62 @@ bool Browser::CanCloseWithInProgressDown
-   return false;
- }
- 
-+bool Browser::CanCloseWithMultipleTabs() {
-+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch("close-confirmation"))
-+    return true;
-+
-+  // If we've prompted, we need to hear from the user before we
-+  // can close.
-+  if (close_multitab_confirmation_state_ != NOT_PROMPTED)
-+    return close_multitab_confirmation_state_ != WAITING_FOR_RESPONSE;
-+
-+  // If we're not running a full browser process with a profile manager
-+  // (testing), it's ok to close the browser.
-+  if (!g_browser_process->profile_manager())
-+    return true;
-+
-+  // Figure out how many windows are open total
-+  int total_window_count = 0;
-+  for (auto* browser : *BrowserList::GetInstance()) {
-+    // Don't count this browser window or any other in the process of closing.
-+    // Window closing may be delayed, and windows that are in the process of
-+    // closing don't count against our totals.
-+    if (browser == this || browser->IsAttemptingToCloseBrowser())
-+      continue;
-+    total_window_count++;
-+  }
-+
-+  const auto flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("close-confirmation");
-+  bool show_confirmation_last_window = flag_value == "last";
-+
-+  if (show_confirmation_last_window) {
-+    if (total_window_count >= 1 || this->tab_strip_model()->count() <= 1)
-+      return true;
-+  } else {
-+    if (total_window_count == 0)
-+      return true;
-+    if (this->tab_strip_model()->count() == 0)
-+      tab_strip_model_delegate_->AddTabAt(GURL(), -1, true);
-+  }
-+
-+  close_multitab_confirmation_state_ = WAITING_FOR_RESPONSE;
-+
-+  // The dialog eats mouse events which results in the close button
-+  // getting stuck in the hover state. Reset the window controls to
-+  // prevent this.
-+  ((BrowserView*)window_)->frame()->non_client_view()->ResetWindowControls();
-+  auto callback = base::BindOnce(&Browser::MultitabResponse,
-+                                 weak_factory_.GetWeakPtr());
-+  MessageBoxDialog::Show(window_->GetNativeWindow(),
-+                         u"Do you want to close this window?", std::u16string(),
-+                         chrome::MESSAGE_BOX_TYPE_QUESTION, u"Close", u"Cancel",
-+                         std::u16string(), std::move(callback));
-+
-+  // Return false so the browser does not close.  We'll close if the user
-+  // confirms in the dialog.
-+  return false;
-+}
-+
- void Browser::InProgressDownloadResponse(bool cancel_downloads) {
-   if (cancel_downloads) {
-     cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
-@@ -2720,6 +2780,22 @@ void Browser::InProgressDownloadResponse
- 
-   std::move(warn_before_closing_callback_)
-       .Run(WarnBeforeClosingResult::kDoNotClose);
-+}
-+
-+void Browser::MultitabResponse(chrome::MessageBoxResult result) {
-+  if (result == chrome::MESSAGE_BOX_RESULT_YES) {
-+    close_multitab_confirmation_state_ = RESPONSE_RECEIVED;
-+    std::move(warn_before_closing_callback_)
-+        .Run(WarnBeforeClosingResult::kOkToClose);
-+    return;
-+  }
-+
-+  // Sets the confirmation state to NOT_PROMPTED so that if the user tries to
-+  // close again we'll show the warning again.
-+  close_multitab_confirmation_state_ = NOT_PROMPTED;
-+
-+  std::move(warn_before_closing_callback_)
-+      .Run(WarnBeforeClosingResult::kDoNotClose);
- }
- 
- void Browser::FinishWarnBeforeClosing(WarnBeforeClosingResult result) {
---- chrome/browser/ui/browser.h.orig
-+++ chrome/browser/ui/browser.h
-@@ -26,6 +26,7 @@
- #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_observer.h"
- #include "chrome/browser/ui/browser_navigator_params.h"
- #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
-+#include "chrome/browser/ui/simple_message_box.h"
- #include "chrome/browser/ui/signin_view_controller.h"
- #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
- #include "chrome/browser/ui/unload_controller.h"
-@@ -1008,12 +1009,17 @@ class Browser : public TabStripModelObse
-   // Returns true if the window can close, false otherwise.
-   bool CanCloseWithInProgressDownloads();
- 
-+  // Called when the window is closing to check if more than one tabs are open
-+  bool CanCloseWithMultipleTabs();
-+
-   // Called when the user has decided whether to proceed or not with the browser
-   // closure.  |cancel_downloads| is true if the downloads should be canceled
-   // and the browser closed, false if the browser should stay open and the
-   // downloads running.
-   void InProgressDownloadResponse(bool cancel_downloads);
- 
-+  void MultitabResponse(chrome::MessageBoxResult result);
-+
-   // Called when all warnings have completed when attempting to close the
-   // browser directly (e.g. via hotkey, close button, terminate signal, etc.)
-   // Used as a WarnBeforeClosingCallback by ShouldCloseWindow().
-@@ -1176,6 +1182,8 @@ class Browser : public TabStripModelObse
-   // when the browser is closed with in-progress downloads.
-   CancelDownloadConfirmationState cancel_download_confirmation_state_;
- 
-+  CancelDownloadConfirmationState close_multitab_confirmation_state_;
-+
-   /////////////////////////////////////////////////////////////////////////////
- 
-   // Override values for the bounds of the window and its maximized or minimized
---- chrome/browser/ungoogled_flag_choices.h.orig
-+++ chrome/browser/ungoogled_flag_choices.h
-@@ -66,4 +66,13 @@ const FeatureEntry::Choice kCloseWindowW
-      "close-window-with-last-tab",
-      "never"},
- };
-+const FeatureEntry::Choice kCloseConfirmation[] = {
-+    {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-+    {"Show confirmation with last window",
-+     "close-confirmation",
-+     "last"},
-+    {"Show confirmation with multiple windows",
-+     "close-confirmation",
-+     "multiple"},
-+};
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -80,4 +80,8 @@
-      "Remove Grab Handle",
-      "Removes the reserved empty space in the tabstrip for moving the window.  ungoogled-chromium flag",
-      kOsDesktop, SINGLE_VALUE_TYPE("remove-grab-handle")},
-+    {"close-confirmation",
-+     "Close Confirmation",
-+     "Show a warning prompt when closing the browser window.  ungoogled-chromium flag",
-+     kOsDesktop, MULTI_VALUE_TYPE(kCloseConfirmation)},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch
deleted file mode 100644
index 6bb52b8..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- chrome/browser/chrome_content_browser_client.cc.orig
-+++ chrome/browser/chrome_content_browser_client.cc
-@@ -743,6 +743,9 @@ bool HandleNewTabPageLocationOverride(
-   Profile* profile = Profile::FromBrowserContext(browser_context);
-   std::string ntp_location =
-       profile->GetPrefs()->GetString(prefs::kNewTabPageLocationOverride);
-+  if (base::CommandLine::ForCurrentProcess()->HasSwitch("custom-ntp"))
-+    ntp_location = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("custom-ntp");
-+  if (profile->IsOffTheRecord() && ntp_location.find("chrome://") != std::string::npos) return false;
-   if (ntp_location.empty())
-     return false;
-   url::Component scheme;
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -84,4 +84,8 @@
-      "Close Confirmation",
-      "Show a warning prompt when closing the browser window.  ungoogled-chromium flag",
-      kOsDesktop, MULTI_VALUE_TYPE(kCloseConfirmation)},
-+    {"custom-ntp",
-+     "Custom New Tab Page",
-+     "Allows setting a custom URL for the new tab page.  Value can be internal (e.g. `about:blank`), external (e.g. `example.com`), or local (e.g. `file:///tmp/startpage.html`).  This applies for incognito windows as well when not set to a `chrome://` internal page.  ungoogled-chromium flag",
-+     kOsDesktop, ORIGIN_LIST_VALUE_TYPE("custom-ntp", "")},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
---- components/flags_ui/flags_state.cc.orig
-+++ components/flags_ui/flags_state.cc
-@@ -231,6 +231,7 @@ std::string GetCombinedOriginListValue(c
-           command_line_switch);
-   const std::string new_value =
-       flags_storage.GetOriginListFlag(internal_entry_name);
-+  if (command_line_switch == "custom-ntp") return existing_value.empty() ? new_value : existing_value;
-   return CombineAndSanitizeOriginLists(existing_value, new_value);
- }
- 
-@@ -417,6 +418,7 @@ void FlagsState::SetOriginListFlag(const
-                                    const std::string& value,
-                                    FlagsStorage* flags_storage) {
-   const std::string new_value =
-+      internal_name == "custom-ntp" ? value :
-       CombineAndSanitizeOriginLists(std::string(), value);
-   flags_storage->SetOriginListFlag(internal_name, new_value);
- 
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch
deleted file mode 100644
index 8fc406a..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig
-+++ chrome/browser/ui/views/frame/tab_strip_region_view.cc
-@@ -42,6 +42,7 @@ class FrameGrabHandle : public views::Vi
-     // Reserve some space for the frame to be grabbed by, even if the tabstrip
-     // is full.
-     // TODO(tbergquist): Define this relative to the NTB insets again.
-+    if (base::CommandLine::ForCurrentProcess()->HasSwitch("remove-grab-handle")) return gfx::Size(0, 0);
-     return gfx::Size(42, 0);
-   }
- };
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -76,4 +76,8 @@
-      "Disable QR Generator",
-      "Disables the QR generator for sharing page links.  ungoogled-chromium flag",
-      kOsDesktop, FEATURE_VALUE_TYPE(kDisableQRGenerator)},
-+    {"remove-grab-handle",
-+     "Remove Grab Handle",
-+     "Removes the reserved empty space in the tabstrip for moving the window.  ungoogled-chromium flag",
-+     kOsDesktop, SINGLE_VALUE_TYPE("remove-grab-handle")},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch
deleted file mode 100644
index 0e695ce..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- chrome/browser/ungoogled_flag_choices.h.orig
-+++ chrome/browser/ungoogled_flag_choices.h
-@@ -45,4 +45,19 @@ const FeatureEntry::Choice kBookmarkBarN
-      "bookmark-bar-ntp",
-      "never"},
- };
-+const FeatureEntry::Choice kOmniboxAutocompleteFiltering[] = {
-+    {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-+    {"Search suggestions only",
-+     "omnibox-autocomplete-filtering",
-+     "search"},
-+    {"Search suggestions and bookmarks",
-+     "omnibox-autocomplete-filtering",
-+     "search-bookmarks"},
-+    {"Search suggestions and internal chrome pages",
-+     "omnibox-autocomplete-filtering",
-+     "search-chrome"},
-+    {"Search suggestions, bookmarks, and internal chrome pages",
-+     "omnibox-autocomplete-filtering",
-+     "search-bookmarks-chrome"},
-+};
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -48,4 +48,8 @@
-      "Bookmark Bar on New-Tab-Page",
-      "Disable the Bookmark Bar on the New-Tab-Page.  ungoogled-chromium flag.",
-      kOsDesktop, MULTI_VALUE_TYPE(kBookmarkBarNewTab)},
-+    {"omnibox-autocomplete-filtering",
-+     "Omnibox Autocomplete Filtering",
-+     "Restrict omnibox autocomplete results to a combination of search suggestions (if enabled), bookmarks, and internal chrome pages.  ungoogled-chromium flag.",
-+     kOsAll, MULTI_VALUE_TYPE(kOmniboxAutocompleteFiltering)},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
---- components/omnibox/browser/autocomplete_controller.cc.orig
-+++ components/omnibox/browser/autocomplete_controller.cc
-@@ -15,6 +15,8 @@
- 
- #include "base/bind.h"
- #include "base/check_op.h"
-+#include "base/containers/contains.h"
-+#include "base/command_line.h"
- #include "base/feature_list.h"
- #include "base/format_macros.h"
- #include "base/metrics/histogram.h"
-@@ -276,6 +278,15 @@ AutocompleteController::AutocompleteCont
-       search_service_worker_signal_sent_(false),
-       template_url_service_(provider_client_->GetTemplateURLService()) {
-   provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
-+  if (base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering")) {
-+    const std::string flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering");
-+    provider_types &= AutocompleteProvider::TYPE_KEYWORD | AutocompleteProvider::TYPE_SEARCH |
-+        AutocompleteProvider::TYPE_HISTORY_URL | AutocompleteProvider::TYPE_BOOKMARK | AutocompleteProvider::TYPE_BUILTIN;
-+    if (!base::Contains(flag_value, "bookmarks"))
-+      provider_types &= ~AutocompleteProvider::TYPE_BOOKMARK;
-+    if (!base::Contains(flag_value, "chrome"))
-+      provider_types &= ~AutocompleteProvider::TYPE_BUILTIN;
-+  }
-   if (provider_types & AutocompleteProvider::TYPE_BOOKMARK)
-     providers_.push_back(new BookmarkProvider(provider_client_.get()));
-   if (provider_types & AutocompleteProvider::TYPE_BUILTIN)
---- components/omnibox/browser/history_url_provider.cc.orig
-+++ components/omnibox/browser/history_url_provider.cc
-@@ -551,6 +551,9 @@ void HistoryURLProvider::Start(const Aut
-   if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
-     matches_.push_back(what_you_typed_match);
- 
-+  if (base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering"))
-+    return;
-+
-   // We'll need the history service to run both passes, so try to obtain it.
-   history::HistoryService* const history_service =
-       client()->GetHistoryService();
---- components/omnibox/browser/search_provider.cc.orig
-+++ components/omnibox/browser/search_provider.cc
-@@ -12,6 +12,7 @@
- #include "base/base64.h"
- #include "base/bind.h"
- #include "base/callback.h"
-+#include "base/command_line.h"
- #include "base/feature_list.h"
- #include "base/i18n/break_iterator.h"
- #include "base/i18n/case_conversion.h"
-@@ -646,6 +647,9 @@ void SearchProvider::Run(bool query_is_p
- }
- 
- void SearchProvider::DoHistoryQuery(bool minimal_changes) {
-+  if (base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering"))
-+    return;
-+
-   // The history query results are synchronous, so if minimal_changes is true,
-   // we still have the last results and don't need to do anything.
-   if (minimal_changes)
---- components/url_formatter/url_fixer.cc.orig
-+++ components/url_formatter/url_fixer.cc
-@@ -9,6 +9,8 @@
- #include <algorithm>
- 
- #include "base/check_op.h"
-+#include "base/containers/contains.h"
-+#include "base/command_line.h"
- #include "base/files/file_path.h"
- #include "base/files/file_util.h"
- #include "base/ranges/algorithm.h"
-@@ -607,6 +609,8 @@ GURL FixupURL(const std::string& text, c
- 
-     FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
-     if (chrome_url && !parts.host.is_valid())
-+     if (!base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering") ||
-+         base::Contains(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering"), "chrome"))
-       url.append(kChromeUIDefaultHost);
-     FixupPort(trimmed, parts.port, &url);
-     FixupPath(trimmed, parts.path, &url);
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch
deleted file mode 100644
index 5b52596..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch
+++ /dev/null
@@ -1,389 +0,0 @@
---- chrome/browser/chrome_content_browser_client.cc.orig
-+++ chrome/browser/chrome_content_browser_client.cc
-@@ -6001,7 +6001,7 @@ bool ChromeContentBrowserClient::ShouldA
-     const url::Origin& embedder_origin,
-     const content::PepperPluginInfo& plugin_info) {
- #if BUILDFLAG(ENABLE_PDF)
--  if (plugin_info.name == ChromeContentClient::kPDFInternalPluginName) {
-+  if (plugin_info.name == ChromeContentClient::GetPDFInternalPluginName()) {
-     return IsPdfInternalPluginAllowedOrigin(embedder_origin);
-   }
- #endif  // BUILDFLAG(ENABLE_PDF)
---- chrome/browser/pdf/pdf_extension_util.cc.orig
-+++ chrome/browser/pdf/pdf_extension_util.cc
-@@ -170,7 +170,7 @@ std::string GetManifest() {
-   DCHECK(manifest_contents.find(kNameTag) != std::string::npos);
-   base::ReplaceFirstSubstringAfterOffset(
-       &manifest_contents, 0, kNameTag,
--      ChromeContentClient::kPDFExtensionPluginName);
-+      ChromeContentClient::GetPDFExtensionPluginName());
- 
-   return manifest_contents;
- }
---- chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc.orig
-+++ chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc
-@@ -65,7 +65,7 @@ class PDFIFrameNavigationThrottleTest :
-     // Register a fake PDF Viewer plugin into our plugin service.
-     content::WebPluginInfo info;
-     info.name =
--        base::ASCIIToUTF16(ChromeContentClient::kPDFExtensionPluginName);
-+        base::ASCIIToUTF16(ChromeContentClient::GetPDFExtensionPluginName());
-     info.mime_types.push_back(content::WebPluginMimeType(
-         kPDFMimeType, "pdf", "Fake PDF description"));
-     plugin_service->RegisterInternalPlugin(info, true);
---- chrome/browser/plugins/plugin_prefs.cc.orig
-+++ chrome/browser/plugins/plugin_prefs.cc
-@@ -40,7 +40,7 @@ bool IsPDFViewerPlugin(const std::u16str
-   // plugin, which is also used for Print Preview. Note that only the PDF viewer
-   // and Print Preview can create the internal PDF plugin in the first place.
-   return plugin_name ==
--         base::ASCIIToUTF16(ChromeContentClient::kPDFExtensionPluginName);
-+         base::ASCIIToUTF16(ChromeContentClient::GetPDFExtensionPluginName());
- }
- 
- }  // namespace
---- chrome/browser/plugins/plugin_prefs_unittest.cc.orig
-+++ chrome/browser/plugins/plugin_prefs_unittest.cc
-@@ -24,11 +24,11 @@ class PluginPrefsTest : public ::testing
- TEST_F(PluginPrefsTest, AlwaysOpenPdfExternally) {
-   EXPECT_EQ(PluginPrefs::NO_POLICY,
-             plugin_prefs_->PolicyStatusForPlugin(base::ASCIIToUTF16(
--                ChromeContentClient::kPDFExtensionPluginName)));
-+                ChromeContentClient::GetPDFExtensionPluginName())));
- 
-   SetAlwaysOpenPdfExternally(true);
- 
-   EXPECT_EQ(PluginPrefs::POLICY_DISABLED,
-             plugin_prefs_->PolicyStatusForPlugin(base::ASCIIToUTF16(
--                ChromeContentClient::kPDFExtensionPluginName)));
-+                ChromeContentClient::GetPDFExtensionPluginName())));
- }
---- chrome/browser/resources/plugin_metadata/plugins_chromeos.json.orig
-+++ chrome/browser/resources/plugin_metadata/plugins_chromeos.json
-@@ -44,6 +44,19 @@
-     "name": "Chrome PDF Viewer",
-     "group_name_matcher": "*Chrome PDF Viewer*"
-   },
-+  "microsoft-edge-pdf": {
-+    "mime_types": [
-+    ],
-+    "versions": [
-+      {
-+        "version": "0",
-+        "status": "fully_trusted",
-+        "comment": "Microsoft Edge PDF has no version information."
-+      }
-+    ],
-+    "name": "Microsoft Edge PDF Viewer",
-+    "group_name_matcher": "*Microsoft Edge PDF Viewer*"
-+  },
-   "chromium-pdf": {
-     "mime_types": [
-     ],
-@@ -70,6 +83,19 @@
-     "name": "Chrome PDF Plugin",
-     "group_name_matcher": "*Chrome PDF Plugin*"
-   },
-+  "microsoft-edge-pdf-plugin": {
-+    "mime_types": [
-+    ],
-+    "versions": [
-+      {
-+        "version": "0",
-+        "status": "fully_trusted",
-+        "comment": "Microsoft Edge PDF Plugin has no version information."
-+      }
-+    ],
-+    "name": "Microsoft Edge PDF Plugin",
-+    "group_name_matcher": "*Microsoft Edge PDF Plugin*"
-+  },
-   "chromium-pdf-plugin": {
-     "mime_types": [
-     ],
---- chrome/browser/resources/plugin_metadata/plugins_linux.json.orig
-+++ chrome/browser/resources/plugin_metadata/plugins_linux.json
-@@ -36,6 +36,19 @@
-     "name": "Chrome PDF Viewer",
-     "group_name_matcher": "*Chrome PDF Viewer*"
-   },
-+  "microsoft-edge-pdf": {
-+    "mime_types": [
-+    ],
-+    "versions": [
-+      {
-+        "version": "0",
-+        "status": "fully_trusted",
-+        "comment": "Microsoft Edge PDF has no version information."
-+      }
-+    ],
-+    "name": "Microsoft Edge PDF Viewer",
-+    "group_name_matcher": "*Microsoft Edge PDF Viewer*"
-+  },
-   "chromium-pdf": {
-     "mime_types": [
-     ],
-@@ -62,6 +75,19 @@
-     "name": "Chrome PDF Plugin",
-     "group_name_matcher": "*Chrome PDF Plugin*"
-   },
-+  "microsoft-edge-pdf-plugin": {
-+    "mime_types": [
-+    ],
-+    "versions": [
-+      {
-+        "version": "0",
-+        "status": "fully_trusted",
-+        "comment": "Google Chrome PDF Plugin has no version information."
-+      }
-+    ],
-+    "name": "Microsoft Edge PDF Plugin",
-+    "group_name_matcher": "*Microsoft Edge PDF Plugin*"
-+  },
-   "chromium-pdf-plugin": {
-     "mime_types": [
-     ],
---- chrome/browser/resources/plugin_metadata/plugins_mac.json.orig
-+++ chrome/browser/resources/plugin_metadata/plugins_mac.json
-@@ -33,6 +33,19 @@
-     "name": "Chrome PDF Viewer",
-     "group_name_matcher": "*Chrome PDF Viewer*"
-   },
-+  "microsoft-edge-pdf": {
-+    "mime_types": [
-+    ],
-+    "versions": [
-+      {
-+        "version": "0",
-+        "status": "fully_trusted",
-+        "comment": "Microsoft Edge PDF Viewer has no version information."
-+      }
-+    ],
-+    "name": "Microsoft Edge PDF Viewer",
-+    "group_name_matcher": "*Microsoft Edge PDF Viewer*"
-+  },
-   "chromium-pdf": {
-     "mime_types": [
-     ],
-@@ -59,6 +72,19 @@
-     "name": "Chrome PDF Plugin",
-     "group_name_matcher": "*Chrome PDF Plugin*"
-   },
-+  "microsoft-edge-pdf-plugin": {
-+    "mime_types": [
-+    ],
-+    "versions": [
-+      {
-+        "version": "0",
-+        "status": "fully_trusted",
-+        "comment": "Microsoft Edge PDF Plugin has no version information."
-+      }
-+    ],
-+    "name": "Microsoft Edge PDF Plugin",
-+    "group_name_matcher": "*Microsoft Edge PDF Plugin*"
-+  },
-   "chromium-pdf-plugin": {
-     "mime_types": [
-     ],
---- chrome/browser/resources/plugin_metadata/plugins_win.json.orig
-+++ chrome/browser/resources/plugin_metadata/plugins_win.json
-@@ -33,6 +33,19 @@
-     "name": "Chrome PDF Viewer",
-     "group_name_matcher": "*Chrome PDF Viewer*"
-   },
-+  "microsoft-edge-pdf": {
-+    "mime_types": [
-+    ],
-+    "versions": [
-+      {
-+        "version": "0",
-+        "status": "fully_trusted",
-+        "comment": "Microsoft Edge PDF Viewer has no version information."
-+      }
-+    ],
-+    "name": "Microsoft Edge PDF Viewer",
-+    "group_name_matcher": "*Microsoft Edge PDF Viewer*"
-+  },
-   "chromium-pdf": {
-     "mime_types": [
-     ],
-@@ -59,6 +72,19 @@
-     "name": "Chrome PDF Plugin",
-     "group_name_matcher": "*Chrome PDF Plugin*"
-   },
-+  "microsoft-edge-pdf-plugin": {
-+    "mime_types": [
-+    ],
-+    "versions": [
-+      {
-+        "version": "0",
-+        "status": "fully_trusted",
-+        "comment": "Microsoft Edge PDF Plugin has no version information."
-+      }
-+    ],
-+    "name": "Microsoft Edge PDF Plugin",
-+    "group_name_matcher": "*Microsoft Edge PDF Plugin*"
-+  },
-   "chromium-pdf-plugin": {
-     "mime_types": [
-     ],
---- chrome/browser/ungoogled_flag_choices.h.orig
-+++ chrome/browser/ungoogled_flag_choices.h
-@@ -34,4 +34,9 @@ const FeatureEntry::Choice kScrollEventC
-      "scroll-tabs",
-      "never"}
- };
-+const FeatureEntry::Choice kPDFPluginNameChoices[] = {
-+    {"Chromium", "", ""},
-+    {"Google Chrome", switches::kPDFPluginName, "chrome"},
-+    {"Microsoft Edge", switches::kPDFPluginName, "edge"},
-+};
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -40,4 +40,8 @@
-      "Scroll switches tab",
-      "Switch to the left/right tab if the wheel-scroll happens over the tabstrip, or the empty space beside the tabstrip.  ungoogled-chromium flag.",
-      kOsDesktop, MULTI_VALUE_TYPE(kScrollEventChangesTab)},
-+    {"pdf-plugin-name",
-+     "Set internal PDF plugin name",
-+     "Sets the internal PDF viewer plugin name. Useful for sites that probe JS API navigator.plugins.  ungoogled-chromium flag.",
-+     kOsDesktop, MULTI_VALUE_TYPE(kPDFPluginNameChoices)},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
---- chrome/common/BUILD.gn.orig
-+++ chrome/common/BUILD.gn
-@@ -249,6 +249,7 @@ static_library("common") {
-     "//components/no_state_prefetch/common",
-     "//components/no_state_prefetch/common:mojo_bindings",
-     "//components/page_load_metrics/common:common",
-+    "//components/ungoogled:ungoogled_switches",
-   ]
- 
-   if (enable_pdf) {
---- chrome/common/chrome_content_client.cc.orig
-+++ chrome/common/chrome_content_client.cc
-@@ -122,7 +122,7 @@ void ComputeBuiltInPlugins(std::vector<c
-   content::PepperPluginInfo pdf_info;
-   pdf_info.is_internal = true;
-   pdf_info.is_out_of_process = true;
--  pdf_info.name = ChromeContentClient::kPDFInternalPluginName;
-+  pdf_info.name = ChromeContentClient::GetPDFInternalPluginName();
-   pdf_info.description = kPDFPluginDescription;
-   pdf_info.path = base::FilePath(ChromeContentClient::kPDFPluginPath);
-   content::WebPluginMimeType pdf_mime_type(
---- chrome/common/chrome_content_client.h.orig
-+++ chrome/common/chrome_content_client.h
-@@ -42,8 +42,8 @@ class ChromeContentClient : public conte
-   static const base::FilePath::CharType kNaClPluginFileName[];
- #endif
- 
--  static const char kPDFExtensionPluginName[];
--  static const char kPDFInternalPluginName[];
-+  static const char *GetPDFExtensionPluginName();
-+  static const char *GetPDFInternalPluginName();
-   static const base::FilePath::CharType kPDFPluginPath[];
- 
-   ChromeContentClient();
---- chrome/common/chrome_content_client_constants.cc.orig
-+++ chrome/common/chrome_content_client_constants.cc
-@@ -2,8 +2,12 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-+#include <string>
-+
-+#include "base/command_line.h"
- #include "build/branding_buildflags.h"
- #include "chrome/common/chrome_content_client.h"
-+#include "components/ungoogled/ungoogled_switches.h"
- 
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
- const base::FilePath::CharType ChromeContentClient::kNotPresent[] =
-@@ -15,15 +19,52 @@ const base::FilePath::CharType ChromeCon
-     FILE_PATH_LITERAL("internal-nacl-plugin");
- #endif
- 
--#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
--const char ChromeContentClient::kPDFExtensionPluginName[] = "Chrome PDF Viewer";
--const char ChromeContentClient::kPDFInternalPluginName[] = "Chrome PDF Plugin";
--#else
--const char ChromeContentClient::kPDFExtensionPluginName[] =
-+namespace {
-+
-+const char kChromePDFExtensionPluginName[] =
-+    "Chrome PDF Viewer";
-+const char kChromePDFInternalPluginName[] =
-+    "Chrome PDF Plugin";
-+const char kEdgePDFExtensionPluginName[] =
-+    "Microsoft Edge PDF Viewer";
-+const char kEdgePDFInternalPluginName[] =
-+    "Microsoft Edge PDF Plugin";
-+const char kChromiumPDFExtensionPluginName[] =
-     "Chromium PDF Viewer";
--const char ChromeContentClient::kPDFInternalPluginName[] =
-+const char kChromiumPDFInternalPluginName[] =
-     "Chromium PDF Plugin";
--#endif
-+
-+} // namespace
-+
-+// static
-+const char *ChromeContentClient::GetPDFExtensionPluginName() {
-+  const base::CommandLine& command_line =
-+      *base::CommandLine::ForCurrentProcess();
-+  if (command_line.HasSwitch(switches::kPDFPluginName)) {
-+    std::string switch_value = command_line.GetSwitchValueASCII(switches::kPDFPluginName);
-+    if (switch_value == "edge") {
-+      return kEdgePDFExtensionPluginName;
-+    } else if (switch_value == "chrome") {
-+      return kChromePDFExtensionPluginName;
-+    }
-+  }
-+  return kChromiumPDFExtensionPluginName;
-+}
-+
-+// static
-+const char *ChromeContentClient::GetPDFInternalPluginName() {
-+  const base::CommandLine& command_line =
-+      *base::CommandLine::ForCurrentProcess();
-+  if (command_line.HasSwitch(switches::kPDFPluginName)) {
-+    std::string switch_value = command_line.GetSwitchValueASCII(switches::kPDFPluginName);
-+    if (switch_value == "edge") {
-+      return kEdgePDFInternalPluginName;
-+    } else if (switch_value == "chrome") {
-+      return kChromePDFInternalPluginName;
-+    }
-+  }
-+  return kChromiumPDFInternalPluginName;
-+}
- 
- const base::FilePath::CharType ChromeContentClient::kPDFPluginPath[] =
-     FILE_PATH_LITERAL("internal-pdf-viewer");
---- chrome/renderer/chrome_content_renderer_client.cc.orig
-+++ chrome/renderer/chrome_content_renderer_client.cc
-@@ -1047,7 +1047,7 @@ WebPlugin* ChromeContentRendererClient::
-             }
-           }
-         } else if (info.name ==
--                   ASCIIToUTF16(ChromeContentClient::kPDFExtensionPluginName)) {
-+                   ASCIIToUTF16(ChromeContentClient::GetPDFExtensionPluginName())) {
-           // Report PDF load metrics. Since the PDF plugin is comprised of an
-           // extension that loads a second plugin, avoid double counting by
-           // ignoring the creation of the second plugin.
-@@ -1079,7 +1079,7 @@ WebPlugin* ChromeContentRendererClient::
- 
- #if BUILDFLAG(ENABLE_PDF)
-         if (info.name ==
--            ASCIIToUTF16(ChromeContentClient::kPDFInternalPluginName)) {
-+            ASCIIToUTF16(ChromeContentClient::GetPDFInternalPluginName())) {
-           return pdf::CreateInternalPlugin(
-               info, std::move(params), render_frame,
-               std::make_unique<ChromePdfInternalPluginDelegate>());
-@@ -1092,7 +1092,7 @@ WebPlugin* ChromeContentRendererClient::
-         PluginUMAReporter::GetInstance()->ReportPluginDisabled(orig_mime_type,
-                                                                url);
-         if (info.name ==
--            ASCIIToUTF16(ChromeContentClient::kPDFExtensionPluginName)) {
-+            ASCIIToUTF16(ChromeContentClient::GetPDFExtensionPluginName())) {
-           ReportPDFLoadStatus(
-               PDFLoadStatus::kShowedDisabledPluginPlaceholderForEmbeddedPdf);
- 
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch
deleted file mode 100644
index 5b97e10..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- chrome/browser/sharing/features.cc.orig
-+++ chrome/browser/sharing/features.cc
-@@ -32,3 +32,5 @@ const base::Feature kSharingPreferVapid
-       base::FEATURE_DISABLED_BY_DEFAULT
- #endif  // defined(OS_ANDROID)
- };
-+
-+const base::Feature kDisableQRGenerator{"DisableQRGenerator", base::FEATURE_DISABLED_BY_DEFAULT};
---- chrome/browser/sharing/features.h.orig
-+++ chrome/browser/sharing/features.h
-@@ -34,4 +34,5 @@ extern const base::Feature kSharingSendV
- // Feature flag for prefer sending sharing message using VAPID.
- extern const base::Feature kSharingPreferVapid;
- 
-+extern const base::Feature kDisableQRGenerator;
- #endif  // CHROME_BROWSER_SHARING_FEATURES_H_
---- chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc.orig
-+++ chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc
-@@ -23,7 +23,7 @@ QRCodeGeneratorBubbleController::~QRCode
- 
- // static
- bool QRCodeGeneratorBubbleController::IsGeneratorAvailable(const GURL& url) {
--  if (!url.SchemeIsHTTPOrHTTPS())
-+  if (!url.SchemeIsHTTPOrHTTPS() || base::FeatureList::IsEnabled(kDisableQRGenerator))
-     return false;
- 
-   return true;
---- chrome/browser/ui/views/location_bar/location_bar_view.cc.orig
-+++ chrome/browser/ui/views/location_bar/location_bar_view.cc
-@@ -297,7 +297,8 @@ void LocationBarView::Init() {
-     // the left most icon.
-     params.types_enabled.push_back(PageActionIconType::kSendTabToSelf);
-     params.types_enabled.push_back(PageActionIconType::kClickToCall);
--    params.types_enabled.push_back(PageActionIconType::kQRCodeGenerator);
-+    if (!base::FeatureList::IsEnabled(kDisableQRGenerator))
-+      params.types_enabled.push_back(PageActionIconType::kQRCodeGenerator);
-     if (base::FeatureList::IsEnabled(kSharedClipboardUI))
-       params.types_enabled.push_back(PageActionIconType::kSharedClipboard);
-     if (base::FeatureList::IsEnabled(kWebOTPCrossDevice))
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -72,4 +72,8 @@
-      "Remove Tabsearch Button",
-      "Removes the tabsearch button from the tabstrip.  ungoogled-chromium flag",
-      kOsDesktop, SINGLE_VALUE_TYPE("remove-tabsearch-button")},
-+    {"disable-qr-generator",
-+     "Disable QR Generator",
-+     "Disables the QR generator for sharing page links.  ungoogled-chromium flag",
-+     kOsDesktop, FEATURE_VALUE_TYPE(kDisableQRGenerator)},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
deleted file mode 100644
index b80101e..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-# Add flag to disable automatic search engine collection
-
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -16,4 +16,8 @@
-      "Handling of extension MIME type requests",
-      "Used when deciding how to handle a request for a CRX or User Script MIME type.  ungoogled-chromium flag.",
-      kOsAll, MULTI_VALUE_TYPE(kExtensionHandlingChoices)},
-+    {"disable-search-engine-collection",
-+     "Disable search engine collection",
-+     "Prevents search engines from being added automatically.  ungoogled-chromium flag.",
-+     kOsAll, SINGLE_VALUE_TYPE("disable-search-engine-collection")},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
---- chrome/renderer/chrome_render_frame_observer.cc.orig
-+++ chrome/renderer/chrome_render_frame_observer.cc
-@@ -139,9 +139,10 @@ ChromeRenderFrameObserver::ChromeRenderF
-   if (!render_frame->IsMainFrame())
-     return;
- 
--#if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
-   const base::CommandLine& command_line =
-       *base::CommandLine::ForCurrentProcess();
-+  should_autocollect_ = !command_line.HasSwitch("disable-search-engine-collection");
-+#if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
-   if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection))
-     SetClientSidePhishingDetection();
- #endif
-@@ -201,14 +202,16 @@ void ChromeRenderFrameObserver::DidFinis
-   if (frame->Parent())
-     return;
- 
--  GURL osdd_url = frame->GetDocument().OpenSearchDescriptionURL();
--  if (!osdd_url.is_empty()) {
--    mojo::AssociatedRemote<chrome::mojom::OpenSearchDescriptionDocumentHandler>
--        osdd_handler;
--    render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(
--        &osdd_handler);
--    osdd_handler->PageHasOpenSearchDescriptionDocument(
--        frame->GetDocument().Url(), osdd_url);
-+  if (should_autocollect_) {
-+    GURL osdd_url = frame->GetDocument().OpenSearchDescriptionURL();
-+    if (!osdd_url.is_empty()) {
-+      mojo::AssociatedRemote<chrome::mojom::OpenSearchDescriptionDocumentHandler>
-+          osdd_handler;
-+      render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(
-+          &osdd_handler);
-+      osdd_handler->PageHasOpenSearchDescriptionDocument(
-+          frame->GetDocument().Url(), osdd_url);
-+    }
-   }
- }
- 
---- chrome/renderer/chrome_render_frame_observer.h.orig
-+++ chrome/renderer/chrome_render_frame_observer.h
-@@ -139,6 +139,7 @@ class ChromeRenderFrameObserver : public
- #if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
-   safe_browsing::PhishingClassifierDelegate* phishing_classifier_ = nullptr;
- #endif
-+  bool should_autocollect_; // Whether to autocollect search engines
- 
-   // Owned by ChromeContentRendererClient and outlive us.
-   web_cache::WebCacheImpl* web_cache_impl_;
---- components/search_engines/template_url_service.cc.orig
-+++ components/search_engines/template_url_service.cc
-@@ -12,6 +12,7 @@
- #include "base/bind.h"
- #include "base/callback.h"
- #include "base/callback_helpers.h"
-+#include "base/command_line.h"
- #include "base/containers/contains.h"
- #include "base/debug/crash_logging.h"
- #include "base/format_macros.h"
-@@ -197,6 +198,12 @@ bool IsCreatedByExtension(const Template
-          template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION;
- }
- 
-+bool ShouldAutocollect() {
-+  const base::CommandLine& command_line =
-+    *base::CommandLine::ForCurrentProcess();
-+  return !command_line.HasSwitch("disable-search-engine-collection");
-+}
-+
- }  // namespace
- 
- // TemplateURLService::LessWithPrefix -----------------------------------------
-@@ -282,6 +289,7 @@ TemplateURLService::TemplateURLService(
-     std::unique_ptr<TemplateURLServiceClient> client,
-     const base::RepeatingClosure& dsp_change_callback)
-     : prefs_(prefs),
-+      should_autocollect_(true),
-       search_terms_data_(std::move(search_terms_data)),
-       web_data_service_(web_data_service),
-       client_(std::move(client)),
-@@ -363,8 +371,8 @@ bool TemplateURLService::CanAddAutogener
-   // that may interfere with search queries).  An easy heuristic for this is
-   // whether the user has a TemplateURL that has been manually modified (e.g.,
-   // renamed) connected to the same host.
--  return !url.is_valid() || url.host().empty() ||
--      CanAddAutogeneratedKeywordForHost(url.host());
-+  return should_autocollect_ && (!url.is_valid() || url.host().empty() ||
-+      CanAddAutogeneratedKeywordForHost(url.host()));
- }
- 
- bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
-@@ -1496,6 +1504,8 @@ SyncDataMap TemplateURLService::CreateGU
- 
- void TemplateURLService::Init(const Initializer* initializers,
-                               int num_initializers) {
-+  should_autocollect_ = ShouldAutocollect();
-+
-   if (client_)
-     client_->SetOwner(this);
- 
-@@ -1632,6 +1642,9 @@ void TemplateURLService::ChangeToLoadedS
- 
- bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
-     const std::string& host) const {
-+  if (!should_autocollect_)
-+    return false;
-+
-   const TemplateURLSet* urls = provider_map_->GetURLsForHost(host);
-   if (!urls)
-     return true;
---- components/search_engines/template_url_service.h.orig
-+++ components/search_engines/template_url_service.h
-@@ -706,6 +706,8 @@ class TemplateURLService : public WebDat
-   // ---------- Browser state related members ---------------------------------
-   PrefService* prefs_ = nullptr;
- 
-+  bool should_autocollect_; // Whether search engines should be auto-collected
-+
-   std::unique_ptr<SearchTermsData> search_terms_data_ =
-       std::make_unique<SearchTermsData>();
- 
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch
deleted file mode 100644
index 6010902..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- chrome/browser/ui/views/tabs/tab.cc.orig
-+++ chrome/browser/ui/views/tabs/tab.cc
-@@ -12,6 +12,7 @@
- #include <utility>
- 
- #include "base/bind.h"
-+#include "base/command_line.h"
- #include "base/debug/alias.h"
- #include "base/i18n/rtl.h"
- #include "base/metrics/user_metrics.h"
-@@ -641,6 +642,8 @@ void Tab::OnGestureEvent(ui::GestureEven
- }
- 
- std::u16string Tab::GetTooltipText(const gfx::Point& p) const {
-+  if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("tab-hover-cards") == "tooltip")
-+    return GetTooltipText(data_.title, GetAlertStateToShow(data_.alert_state));
-   // Tab hover cards replace tooltips for tabs.
-   return std::u16string();
- }
---- chrome/browser/ui/views/tabs/tab_strip.cc.orig
-+++ chrome/browser/ui/views/tabs/tab_strip.cc
-@@ -15,6 +15,7 @@
- 
- #include "base/bind.h"
- #include "base/callback.h"
-+#include "base/command_line.h"
- #include "base/compiler_specific.h"
- #include "base/containers/adapters.h"
- #include "base/containers/contains.h"
-@@ -2153,6 +2154,8 @@ void TabStrip::OnMouseEventInTab(views::
- }
- 
- void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {
-+  if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("tab-hover-cards") == "tooltip" ||
-+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("tab-hover-cards") == "none") return;
-   // Some operations (including e.g. starting a drag) can cause the tab focus
-   // to change at the same time as the tabstrip is starting to animate; the
-   // hover card should not be visible at this time.
---- chrome/browser/ungoogled_flag_choices.h.orig
-+++ chrome/browser/ungoogled_flag_choices.h
-@@ -75,4 +75,13 @@ const FeatureEntry::Choice kCloseConfirm
-      "close-confirmation",
-      "multiple"},
- };
-+const FeatureEntry::Choice kTabHoverCards[] = {
-+    {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-+    {"None",
-+     "tab-hover-cards",
-+     "none"},
-+    {"Tooltip",
-+     "tab-hover-cards",
-+     "tooltip"},
-+};
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -88,4 +88,8 @@
-      "Custom New Tab Page",
-      "Allows setting a custom URL for the new tab page.  Value can be internal (e.g. `about:blank`), external (e.g. `example.com`), or local (e.g. `file:///tmp/startpage.html`).  This applies for incognito windows as well when not set to a `chrome://` internal page.  ungoogled-chromium flag",
-      kOsDesktop, ORIGIN_LIST_VALUE_TYPE("custom-ntp", "")},
-+    {"tab-hover-cards",
-+     "Tab Hover Cards",
-+     "Allows removing the tab hover cards or using a tooltip as a replacement.  ungoogled-chromium flag.",
-+     kOsDesktop, MULTI_VALUE_TYPE(kTabHoverCards)},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch
deleted file mode 100644
index 317602c..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- chrome/browser/ui/browser_command_controller.cc.orig
-+++ chrome/browser/ui/browser_command_controller.cc
-@@ -1139,7 +1139,8 @@ void BrowserCommandController::InitComma
-   command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
-                                         normal_window);
- 
--  const bool enable_tab_search_commands = browser_->is_type_normal();
-+  const bool enable_tab_search_commands = browser_->is_type_normal() &&
-+      !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button");
-   command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH,
-                                         enable_tab_search_commands);
-   command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH_CLOSE,
---- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig
-+++ chrome/browser/ui/views/frame/tab_strip_region_view.cc
-@@ -5,6 +5,7 @@
- #include "chrome/browser/ui/views/frame/tab_strip_region_view.h"
- 
- #include "base/bind.h"
-+#include "base/command_line.h"
- #include "base/strings/utf_string_conversions.h"
- #include "build/build_config.h"
- #include "chrome/browser/themes/theme_properties.h"
-@@ -132,7 +133,8 @@ TabStripRegionView::TabStripRegionView(s
-     return;
- #endif
-   const Browser* browser = tab_strip_->controller()->GetBrowser();
--  if (browser && browser->is_type_normal()) {
-+  if (browser && browser->is_type_normal() &&
-+      !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button")) {
-     auto tab_search_button = std::make_unique<TabSearchButton>(tab_strip_);
-     tab_search_button->SetTooltipText(
-         l10n_util::GetStringUTF16(IDS_TOOLTIP_TAB_SEARCH));
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -68,4 +68,8 @@
-      "Clear data on exit",
-      "Clears all browsing data on exit.  ungoogled-chromium flag",
-      kOsDesktop, FEATURE_VALUE_TYPE(browsing_data::features::kClearDataOnExit)},
-+    {"remove-tabsearch-button",
-+     "Remove Tabsearch Button",
-+     "Removes the tabsearch button from the tabstrip.  ungoogled-chromium flag",
-+     kOsDesktop, SINGLE_VALUE_TYPE("remove-tabsearch-button")},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch
deleted file mode 100644
index 070c4cd..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc.orig
-+++ chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
-@@ -24,6 +24,7 @@
- #include "chrome/browser/profiles/profile.h"
- #include "chrome/browser/profiles/profile_manager.h"
- #include "chrome/browser/sync/sync_service_factory.h"
-+#include "components/browsing_data/core/features.h"
- #include "components/browsing_data/core/pref_names.h"
- #include "components/keep_alive_registry/keep_alive_types.h"
- #include "components/keep_alive_registry/scoped_keep_alive.h"
-@@ -151,6 +152,21 @@ class BrowsingDataRemoverObserver
- #endif
- };
- 
-+uint64_t AllOriginTypeMask() {
-+  return content::BrowsingDataRemover::ORIGIN_TYPE_PROTECTED_WEB |
-+         content::BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB;
-+}
-+
-+uint64_t AllRemoveMask() {
-+  return content::BrowsingDataRemover::DATA_TYPE_CACHE |
-+         content::BrowsingDataRemover::DATA_TYPE_DOWNLOADS |
-+         chrome_browsing_data_remover::DATA_TYPE_CONTENT_SETTINGS |
-+         chrome_browsing_data_remover::DATA_TYPE_FORM_DATA |
-+         chrome_browsing_data_remover::DATA_TYPE_HISTORY |
-+         chrome_browsing_data_remover::DATA_TYPE_PASSWORDS |
-+         chrome_browsing_data_remover::DATA_TYPE_SITE_DATA;
-+}
-+
- uint64_t GetOriginTypeMask(const base::Value& data_types) {
-   uint64_t result = 0;
-   for (const auto& data_type : data_types.GetList()) {
-@@ -292,8 +308,9 @@ void ChromeBrowsingDataLifetimeManager::
-     bool keep_browser_alive) {
-   auto* data_types = profile_->GetPrefs()->GetList(
-       browsing_data::prefs::kClearBrowsingDataOnExitList);
--  if (data_types && !data_types->GetList().empty() &&
--      !SyncServiceFactory::IsSyncAllowed(profile_)) {
-+  bool cdoe = base::FeatureList::IsEnabled(browsing_data::features::kClearDataOnExit);
-+  if (cdoe || (data_types && !data_types->GetList().empty() &&
-+      !SyncServiceFactory::IsSyncAllowed(profile_))) {
-     profile_->GetPrefs()->SetBoolean(
-         browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true);
-     auto* remover = profile_->GetBrowsingDataRemover();
-@@ -304,8 +321,8 @@ void ChromeBrowsingDataLifetimeManager::
-       DCHECK(keep_browser_alive);
- #endif
-     remover->RemoveAndReply(base::Time(), base::Time::Max(),
--                            GetRemoveMask(*data_types),
--                            GetOriginTypeMask(*data_types),
-+                            cdoe ? AllRemoveMask() : GetRemoveMask(*data_types),
-+                            cdoe ? AllOriginTypeMask() : GetOriginTypeMask(*data_types),
-                             BrowsingDataRemoverObserver::Create(
-                                 remover, /*filterable_deletion=*/true, profile_,
-                                 keep_browser_alive));
---- chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_factory.cc.orig
-+++ chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_factory.cc
-@@ -48,6 +48,8 @@ ChromeBrowsingDataLifetimeManagerFactory
- KeyedService* ChromeBrowsingDataLifetimeManagerFactory::BuildServiceInstanceFor(
-     content::BrowserContext* context) const {
-   if (!base::FeatureList::IsEnabled(
-+          browsing_data::features::kClearDataOnExit) &&
-+      !base::FeatureList::IsEnabled(
-           browsing_data::features::kEnableBrowsingDataLifetimeManager))
-     return nullptr;
-   Profile* profile = Profile::FromBrowserContext(context);
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -64,4 +64,8 @@
-      "Keep old history",
-      "Keep history older than 3 months.  ungoogled-chromium flag",
-      kOsAll, SINGLE_VALUE_TYPE("keep-old-history")},
-+    {"clear-data-on-exit",
-+     "Clear data on exit",
-+     "Clears all browsing data on exit.  ungoogled-chromium flag",
-+     kOsDesktop, FEATURE_VALUE_TYPE(browsing_data::features::kClearDataOnExit)},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
---- components/browsing_data/core/features.cc.orig
-+++ components/browsing_data/core/features.cc
-@@ -19,5 +19,7 @@ const base::Feature kEnableBrowsingDataL
- const base::Feature kEnableBrowsingDataLifetimeManager{
-     "BrowsingDataLifetimeManager", base::FEATURE_ENABLED_BY_DEFAULT};
- #endif
-+
-+const base::Feature kClearDataOnExit{"ClearDataOnExit", base::FEATURE_DISABLED_BY_DEFAULT};
- }  // namespace features
- }  // namespace browsing_data
---- components/browsing_data/core/features.h.orig
-+++ components/browsing_data/core/features.h
-@@ -17,6 +17,7 @@ extern const base::Feature kEnableRemovi
- // defined by the BrowsingDataLifetime policy.
- extern const base::Feature kEnableBrowsingDataLifetimeManager;
- 
-+extern const base::Feature kClearDataOnExit;
- }  // namespace features
- }  // namespace browsing_data
- 
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch
deleted file mode 100644
index b0358e8..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- chrome/browser/ui/tabs/tab_strip_model.cc.orig
-+++ chrome/browser/ui/tabs/tab_strip_model.cc
-@@ -11,6 +11,7 @@
- #include <utility>
- 
- #include "base/auto_reset.h"
-+#include "base/command_line.h"
- #include "base/containers/flat_map.h"
- #include "base/cxx17_backports.h"
- #include "base/metrics/histogram_macros.h"
-@@ -1779,6 +1780,10 @@ bool TabStripModel::CloseTabs(base::span
-   if (items.empty())
-     return true;
- 
-+  const std::string flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("close-window-with-last-tab");
-+  if (flag_value == "never" && !closing_all_ && items.size() == count())
-+    delegate()->AddTabAt(GURL(), -1, true);
-+
-   const bool closing_all = static_cast<int>(items.size()) == count();
-   base::WeakPtr<TabStripModel> ref = weak_factory_.GetWeakPtr();
-   if (closing_all) {
---- chrome/browser/ungoogled_flag_choices.h.orig
-+++ chrome/browser/ungoogled_flag_choices.h
-@@ -60,4 +60,10 @@ const FeatureEntry::Choice kOmniboxAutoc
-      "omnibox-autocomplete-filtering",
-      "search-bookmarks-chrome"},
- };
-+const FeatureEntry::Choice kCloseWindowWithLastTab[] = {
-+    {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-+    {"Never",
-+     "close-window-with-last-tab",
-+     "never"},
-+};
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -52,4 +52,8 @@
-      "Omnibox Autocomplete Filtering",
-      "Restrict omnibox autocomplete results to a combination of search suggestions (if enabled), bookmarks, and internal chrome pages.  ungoogled-chromium flag.",
-      kOsAll, MULTI_VALUE_TYPE(kOmniboxAutocompleteFiltering)},
-+    {"close-window-with-last-tab",
-+     "Close window with last tab",
-+     "Determines whether a window should close once the last tab is closed.  ungoogled-chromium flag.",
-+     kOsDesktop, MULTI_VALUE_TYPE(kCloseWindowWithLastTab)},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch
deleted file mode 100644
index 381de61..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-# Add extension-mime-request-handling chrome://flag to tweak the behavior of
-# extension MIME types
-
---- chrome/browser/download/download_crx_util.cc.orig
-+++ chrome/browser/download/download_crx_util.cc
-@@ -8,6 +8,7 @@
- 
- #include <memory>
- 
-+#include "base/command_line.h"
- #include "chrome/browser/chrome_notification_types.h"
- #include "chrome/browser/extensions/crx_installer.h"
- #include "chrome/browser/extensions/extension_install_prompt.h"
-@@ -128,6 +129,14 @@ scoped_refptr<extensions::CrxInstaller>
-   return installer;
- }
- 
-+bool ShouldDownloadAsRegularFile() {
-+    const base::CommandLine& command_line =
-+        *base::CommandLine::ForCurrentProcess();
-+    return command_line.HasSwitch("extension-mime-request-handling") &&
-+        command_line.GetSwitchValueASCII("extension-mime-request-handling") ==
-+        "download-as-regular-file";
-+}
-+
- bool IsExtensionDownload(const DownloadItem& download_item) {
-   if (download_item.GetTargetDisposition() ==
-       DownloadItem::TARGET_DISPOSITION_PROMPT)
-@@ -136,7 +145,7 @@ bool IsExtensionDownload(const DownloadI
-   if (download_item.GetMimeType() == extensions::Extension::kMimeType ||
-       extensions::UserScript::IsURLUserScript(download_item.GetURL(),
-                                               download_item.GetMimeType())) {
--    return true;
-+    return !ShouldDownloadAsRegularFile();
-   } else {
-     return false;
-   }
---- chrome/browser/download/download_crx_util.h.orig
-+++ chrome/browser/download/download_crx_util.h
-@@ -43,6 +43,10 @@ scoped_refptr<extensions::CrxInstaller>
-     Profile* profile,
-     const download::DownloadItem& download_item);
- 
-+// Returns true if the user wants all extensions to be downloaded as regular
-+// files.
-+bool ShouldDownloadAsRegularFile();
-+
- // Returns true if this is an extension download. This also considers user
- // scripts to be extension downloads, since we convert those automatically.
- bool IsExtensionDownload(const download::DownloadItem& download_item);
---- chrome/browser/download/download_target_determiner.cc.orig
-+++ chrome/browser/download/download_target_determiner.cc
-@@ -1059,10 +1059,12 @@ DownloadConfirmationReason DownloadTarge
-     return DownloadConfirmationReason::SAVE_AS;
- 
- #if BUILDFLAG(ENABLE_EXTENSIONS)
--  // Don't prompt for extension downloads if the installation site is white
--  // listed.
--  if (download_crx_util::IsTrustedExtensionDownload(GetProfile(), *download_))
--    return DownloadConfirmationReason::NONE;
-+  if (!download_crx_util::ShouldDownloadAsRegularFile()) {
-+    // Don't prompt for extension downloads.
-+    if (download_crx_util::IsTrustedExtensionDownload(GetProfile(), *download_) ||
-+        filename.MatchesExtension(extensions::kExtensionFileExtension))
-+      return DownloadConfirmationReason::NONE;
-+  }
- #endif
- 
-   // Don't prompt for file types that are marked for opening automatically.
---- chrome/browser/extensions/extension_management.cc.orig
-+++ chrome/browser/extensions/extension_management.cc
-@@ -10,6 +10,7 @@
- 
- #include "base/bind.h"
- #include "base/callback_helpers.h"
-+#include "base/command_line.h"
- #include "base/containers/contains.h"
- #include "base/logging.h"
- #include "base/metrics/histogram_functions.h"
-@@ -250,6 +251,13 @@ bool ExtensionManagement::IsInstallation
- bool ExtensionManagement::IsOffstoreInstallAllowed(
-     const GURL& url,
-     const GURL& referrer_url) const {
-+  const base::CommandLine& command_line =
-+      *base::CommandLine::ForCurrentProcess();
-+  if (command_line.HasSwitch("extension-mime-request-handling") &&
-+      command_line.GetSwitchValueASCII("extension-mime-request-handling") ==
-+      "always-prompt-for-install") {
-+    return true;
-+  }
-   // No allowed install sites specified, disallow by default.
-   if (!global_settings_->has_restricted_install_sources)
-     return false;
---- chrome/browser/ungoogled_flag_choices.h.orig
-+++ chrome/browser/ungoogled_flag_choices.h
-@@ -4,4 +4,13 @@
- 
- #ifndef CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
- #define CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
-+const FeatureEntry::Choice kExtensionHandlingChoices[] = {
-+    {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-+    {"Download as regular file",
-+     "extension-mime-request-handling",
-+     "download-as-regular-file"},
-+    {"Always prompt for install",
-+     "extension-mime-request-handling",
-+     "always-prompt-for-install"},
-+};
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -12,4 +12,8 @@
-      "Enable stacking in the tab strip",
-      "Forces tabs to be stacked in the tab strip. Otherwise, they follow default behavior.  ungoogled-chromium flag.",
-      kOsAll, SINGLE_VALUE_TYPE("enable-stacked-tab-strip")},
-+    {"extension-mime-request-handling",
-+     "Handling of extension MIME type requests",
-+     "Used when deciding how to handle a request for a CRX or User Script MIME type.  ungoogled-chromium flag.",
-+     kOsAll, MULTI_VALUE_TYPE(kExtensionHandlingChoices)},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch
deleted file mode 100644
index 9a31082..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-# Make popups go to tabs instead
-
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -56,4 +56,8 @@
-      "Close window with last tab",
-      "Determines whether a window should close once the last tab is closed.  ungoogled-chromium flag.",
-      kOsDesktop, MULTI_VALUE_TYPE(kCloseWindowWithLastTab)},
-+    {"popups-to-tabs",
-+     "Popups to tabs",
-+     "Makes popups open in new tabs.  ungoogled-chromium flag",
-+     kOsAll, SINGLE_VALUE_TYPE("popups-to-tabs")},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
---- content/renderer/render_view_impl.cc.orig
-+++ content/renderer/render_view_impl.cc
-@@ -73,6 +73,8 @@ WindowOpenDisposition RenderViewImpl::Na
-     case blink::kWebNavigationPolicyNewWindow:
-       return WindowOpenDisposition::NEW_WINDOW;
-     case blink::kWebNavigationPolicyNewPopup:
-+      if (base::CommandLine::ForCurrentProcess()->HasSwitch("popups-to-tabs"))
-+        return WindowOpenDisposition::NEW_FOREGROUND_TAB;
-       return WindowOpenDisposition::NEW_POPUP;
-     default:
-       NOTREACHED() << "Unexpected WebNavigationPolicy";
---- ui/base/mojom/window_open_disposition_mojom_traits.h.orig
-+++ ui/base/mojom/window_open_disposition_mojom_traits.h
-@@ -5,6 +5,7 @@
- #ifndef UI_BASE_MOJOM_WINDOW_OPEN_DISPOSITION_MOJOM_TRAITS_H_
- #define UI_BASE_MOJOM_WINDOW_OPEN_DISPOSITION_MOJOM_TRAITS_H_
- 
-+#include "base/command_line.h"
- #include "base/notreached.h"
- #include "mojo/public/cpp/bindings/enum_traits.h"
- #include "ui/base/mojom/window_open_disposition.mojom.h"
-@@ -28,6 +29,8 @@ struct EnumTraits<ui::mojom::WindowOpenD
-       case WindowOpenDisposition::NEW_BACKGROUND_TAB:
-         return ui::mojom::WindowOpenDisposition::NEW_BACKGROUND_TAB;
-       case WindowOpenDisposition::NEW_POPUP:
-+        if (base::CommandLine::ForCurrentProcess()->HasSwitch("popups-to-tabs"))
-+          return ui::mojom::WindowOpenDisposition::NEW_FOREGROUND_TAB;
-         return ui::mojom::WindowOpenDisposition::NEW_POPUP;
-       case WindowOpenDisposition::NEW_WINDOW:
-         return ui::mojom::WindowOpenDisposition::NEW_WINDOW;
-@@ -63,6 +66,8 @@ struct EnumTraits<ui::mojom::WindowOpenD
-         return true;
-       case ui::mojom::WindowOpenDisposition::NEW_POPUP:
-         *out = WindowOpenDisposition::NEW_POPUP;
-+        if (base::CommandLine::ForCurrentProcess()->HasSwitch("popups-to-tabs"))
-+          *out = WindowOpenDisposition::NEW_FOREGROUND_TAB;
-         return true;
-       case ui::mojom::WindowOpenDisposition::NEW_WINDOW:
-         *out = WindowOpenDisposition::NEW_WINDOW;
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch
deleted file mode 100644
index c46ec2b..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# Add --disable-beforeunload to always disable beforeunload JavaScript dialogs
-
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -20,4 +20,8 @@
-      "Disable search engine collection",
-      "Prevents search engines from being added automatically.  ungoogled-chromium flag.",
-      kOsAll, SINGLE_VALUE_TYPE("disable-search-engine-collection")},
-+    {"disable-beforeunload",
-+     "Disable beforeunload",
-+     "Disables JavaScript dialog boxes triggered by beforeunload.  ungoogled-chromium flag.",
-+     kOsAll, SINGLE_VALUE_TYPE("disable-beforeunload")},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
---- components/javascript_dialogs/app_modal_dialog_manager.cc.orig
-+++ components/javascript_dialogs/app_modal_dialog_manager.cc
-@@ -8,6 +8,7 @@
- #include <utility>
- 
- #include "base/bind.h"
-+#include "base/command_line.h"
- #include "base/i18n/rtl.h"
- #include "base/macros.h"
- #include "base/metrics/histogram_macros.h"
-@@ -196,7 +197,8 @@ void AppModalDialogManager::RunBeforeUnl
-   ChromeJavaScriptDialogExtraData* extra_data =
-       &javascript_dialog_extra_data_[web_contents];
- 
--  if (extra_data->suppress_javascript_messages_) {
-+  if (extra_data->suppress_javascript_messages_
-+        || base::CommandLine::ForCurrentProcess()->HasSwitch("disable-beforeunload")) {
-     // If a site harassed the user enough for them to put it on mute, then it
-     // lost its privilege to deny unloading.
-     std::move(callback).Run(true, std::u16string());
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch
deleted file mode 100644
index 090432a..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# Keep local history longer than 90 days
-
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -60,4 +60,8 @@
-      "Popups to tabs",
-      "Makes popups open in new tabs.  ungoogled-chromium flag",
-      kOsAll, SINGLE_VALUE_TYPE("popups-to-tabs")},
-+    {"keep-old-history",
-+     "Keep old history",
-+     "Keep history older than 3 months.  ungoogled-chromium flag",
-+     kOsAll, SINGLE_VALUE_TYPE("keep-old-history")},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
---- components/history/core/browser/history_backend.cc.orig
-+++ components/history/core/browser/history_backend.cc
-@@ -15,6 +15,7 @@
- #include <vector>
- 
- #include "base/bind.h"
-+#include "base/command_line.h"
- #include "base/callback_helpers.h"
- #include "base/compiler_specific.h"
- #include "base/containers/flat_set.h"
-@@ -911,7 +912,8 @@ void HistoryBackend::InitImpl(
-   db_->GetStartDate(&first_recorded_time_);
- 
-   // Start expiring old stuff.
--  expirer_.StartExpiringOldStuff(base::Days(kExpireDaysThreshold));
-+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch("keep-old-history"))
-+    expirer_.StartExpiringOldStuff(base::Days(kExpireDaysThreshold));
- 
-   LOCAL_HISTOGRAM_TIMES("History.InitTime", TimeTicks::Now() - beginning_time);
- }
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch
deleted file mode 100644
index be26b2c..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# Add flag to force punycode in hostnames instead of Unicode when displaying Internationalized Domain Names (IDNs) to mitigate homograph attacks
-
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -24,4 +24,8 @@
-      "Disable beforeunload",
-      "Disables JavaScript dialog boxes triggered by beforeunload.  ungoogled-chromium flag.",
-      kOsAll, SINGLE_VALUE_TYPE("disable-beforeunload")},
-+    {"force-punycode-hostnames",
-+     "Force punycode hostnames",
-+     "Force punycode in hostnames instead of Unicode when displaying Internationalized Domain Names (IDNs).  ungoogled-chromium flag.",
-+     kOsAll, SINGLE_VALUE_TYPE("force-punycode-hostnames")},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
---- components/url_formatter/url_formatter.cc.orig
-+++ components/url_formatter/url_formatter.cc
-@@ -8,6 +8,7 @@
- #include <utility>
- #include <vector>
- 
-+#include "base/command_line.h"
- #include "base/lazy_instance.h"
- #include "base/numerics/safe_conversions.h"
- #include "base/strings/strcat.h"
-@@ -264,6 +265,13 @@ IDNConversionResult IDNToUnicodeWithAdju
-   host16.reserve(host.length());
-   host16.insert(host16.end(), host.begin(), host.end());
- 
-+  if (base::CommandLine::ForCurrentProcess()->HasSwitch("force-punycode-hostnames")) {
-+    // Leave as punycode.
-+    IDNConversionResult result;
-+    result.result = host16;
-+    return result;
-+  }
-+
-   // Compute the top level domain to be used in spoof checks later.
-   base::StringPiece top_level_domain;
-   std::u16string top_level_domain_unicode;
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch
deleted file mode 100644
index 87da094..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# Add flag --hide-crashed-bubble to hide the bubble box:
-# "Restore Pages? Chromium didn't shut down correctly."
-
---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig
-+++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -648,7 +648,8 @@ void StartupBrowserCreatorImpl::AddInfoB
-   if (command_line_.HasSwitch(switches::kKioskMode))
-     return;
- 
--  if (HasPendingUncleanExit(browser->profile()))
-+  if (HasPendingUncleanExit(browser->profile()) &&
-+      !command_line_.HasSwitch("hide-crashed-bubble"))
-     SessionCrashedBubble::ShowIfNotOffTheRecordProfile(
-         browser, /*skip_tab_checking=*/false);
- 
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -32,4 +32,8 @@
-      "Show avatar/people/profile button",
-      "Show avatar/people/profile button in the browser toolbar.  ungoogled-chromium flag.",
-      kOsDesktop, MULTI_VALUE_TYPE(kShowAvatarButtonChoices)},
-+    {"hide-crashed-bubble",
-+     "Hide crashed bubble",
-+     "Hides the bubble box with the message \"Restore Pages? Chromium didn't shut down correctly.\" that shows on startup after the browser did not exit cleanly.  ungoogled-chromium flag.",
-+     kOsAll, SINGLE_VALUE_TYPE("hide-crashed-bubble")},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch
deleted file mode 100644
index 7937d6f..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- chrome/browser/ui/views/tabs/tab_strip.cc.orig
-+++ chrome/browser/ui/views/tabs/tab_strip.cc
-@@ -1909,6 +1909,8 @@ bool TabStrip::SupportsMultipleSelection
- }
- 
- bool TabStrip::ShouldHideCloseButtonForTab(Tab* tab) const {
-+  if (base::CommandLine::ForCurrentProcess()->HasSwitch("hide-tab-close-buttons"))
-+    return true;
-   if (tab->IsActive())
-     return false;
-   return !!touch_layout_;
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -92,4 +92,8 @@
-      "Tab Hover Cards",
-      "Allows removing the tab hover cards or using a tooltip as a replacement.  ungoogled-chromium flag.",
-      kOsDesktop, MULTI_VALUE_TYPE(kTabHoverCards)},
-+    {"hide-tab-close-buttons",
-+     "Hide tab close buttons",
-+     "Hides the close buttons on tabs.  ungoogled-chromium flag.",
-+     kOsDesktop, SINGLE_VALUE_TYPE("hide-tab-close-buttons")},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch
deleted file mode 100644
index d657480..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- chrome/browser/ui/views/frame/browser_root_view.cc.orig
-+++ chrome/browser/ui/views/frame/browser_root_view.cc
-@@ -11,6 +11,7 @@
- 
- #include "base/bind.h"
- #include "base/callback_helpers.h"
-+#include "base/command_line.h"
- #include "base/metrics/user_metrics.h"
- #include "base/task/post_task.h"
- #include "base/task/thread_pool.h"
-@@ -109,6 +110,18 @@ DragOperation GetDropEffect(const ui::Dr
-   return DragOperation::kMove;
- }
- 
-+bool ShouldScrollChangesTab() {
-+  const std::string flag_value =
-+    base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("scroll-tabs");
-+
-+  if (flag_value == "always")
-+    return true;
-+  else if (flag_value == "never")
-+    return false;
-+
-+  return browser_defaults::kScrollEventChangesTab;
-+}
-+
- }  // namespace
- 
- BrowserRootView::DropInfo::DropInfo() = default;
-@@ -120,7 +133,9 @@ BrowserRootView::DropInfo::~DropInfo() {
- 
- BrowserRootView::BrowserRootView(BrowserView* browser_view,
-                                  views::Widget* widget)
--    : views::internal::RootView(widget), browser_view_(browser_view) {}
-+    : views::internal::RootView(widget), browser_view_(browser_view) {
-+  scroll_event_changes_tab_ = ShouldScrollChangesTab();
-+}
- 
- BrowserRootView::~BrowserRootView() {
-   // It's possible to destroy the browser while a drop is active.  In this case,
-@@ -245,7 +260,7 @@ bool BrowserRootView::OnMouseWheel(const
- 
-   // Scroll-event-changes-tab is incompatible with scrolling tabstrip, so
-   // disable it if the latter feature is enabled.
--  if (browser_defaults::kScrollEventChangesTab &&
-+  if (scroll_event_changes_tab_ &&
-       !base::FeatureList::IsEnabled(features::kScrollableTabStrip)) {
-     // Switch to the left/right tab if the wheel-scroll happens over the
-     // tabstrip, or the empty space beside the tabstrip.
---- chrome/browser/ui/views/frame/browser_root_view.h.orig
-+++ chrome/browser/ui/views/frame/browser_root_view.h
-@@ -143,6 +143,8 @@ class BrowserRootView : public views::in
-   int scroll_remainder_x_ = 0;
-   int scroll_remainder_y_ = 0;
- 
-+  bool scroll_event_changes_tab_ = false;
-+
-   std::unique_ptr<DropInfo> drop_info_;
- 
-   base::WeakPtrFactory<BrowserRootView> weak_ptr_factory_{this};
---- chrome/browser/ungoogled_flag_choices.h.orig
-+++ chrome/browser/ungoogled_flag_choices.h
-@@ -25,4 +25,13 @@ const FeatureEntry::Choice kShowAvatarBu
-      "show-avatar-button",
-      "never"}
- };
-+const FeatureEntry::Choice kScrollEventChangesTab[] = {
-+    {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-+    {"Always",
-+     "scroll-tabs",
-+     "always"},
-+    {"Never",
-+     "scroll-tabs",
-+     "never"}
-+};
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -36,4 +36,8 @@
-      "Hide crashed bubble",
-      "Hides the bubble box with the message \"Restore Pages? Chromium didn't shut down correctly.\" that shows on startup after the browser did not exit cleanly.  ungoogled-chromium flag.",
-      kOsAll, SINGLE_VALUE_TYPE("hide-crashed-bubble")},
-+    {"scroll-tabs",
-+     "Scroll switches tab",
-+     "Switch to the left/right tab if the wheel-scroll happens over the tabstrip, or the empty space beside the tabstrip.  ungoogled-chromium flag.",
-+     kOsDesktop, MULTI_VALUE_TYPE(kScrollEventChangesTab)},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch
deleted file mode 100644
index 8fe39bd..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- chrome/browser/ui/views/toolbar/toolbar_view.cc.orig
-+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
-@@ -273,12 +273,28 @@ void ToolbarView::Init() {
- 
-   std::unique_ptr<ToolbarAccountIconContainerView>
-       toolbar_account_icon_container;
-+
-+  const base::CommandLine& command_line =
-+      *base::CommandLine::ForCurrentProcess();
-+  const std::string flag_value =
-+      command_line.GetSwitchValueASCII("show-avatar-button");
-+
-+  bool in_incognito_or_guest_mode = browser_->profile()->IsOffTheRecord() ||
-+                                    browser_->profile()->IsGuestSession();
-+
-   bool show_avatar_toolbar_button = true;
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-   // ChromeOS only badges Incognito and Guest icons in the browser window.
--  show_avatar_toolbar_button = browser_->profile()->IsOffTheRecord() ||
--                               browser_->profile()->IsGuestSession();
-+  show_avatar_toolbar_button = in_incognito_or_guest_mode;
- #endif
-+
-+  if (flag_value == "always")
-+    show_avatar_toolbar_button = true;
-+  else if (flag_value == "incognito-and-guest")
-+    show_avatar_toolbar_button = in_incognito_or_guest_mode;
-+  else if (flag_value == "never")
-+    show_avatar_toolbar_button = false;
-+
-   if (base::FeatureList::IsEnabled(
-           autofill::features::kAutofillEnableToolbarStatusChip)) {
-     // The avatar button is contained inside the page-action container and
---- chrome/browser/ungoogled_flag_choices.h.orig
-+++ chrome/browser/ungoogled_flag_choices.h
-@@ -13,4 +13,16 @@ const FeatureEntry::Choice kExtensionHan
-      "extension-mime-request-handling",
-      "always-prompt-for-install"},
- };
-+const FeatureEntry::Choice kShowAvatarButtonChoices[] = {
-+    {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-+    {"Always",
-+     "show-avatar-button",
-+     "always"},
-+    {"Incognito and Guest",
-+     "show-avatar-button",
-+     "incognito-and-guest"},
-+    {"Never",
-+     "show-avatar-button",
-+     "never"}
-+};
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -28,4 +28,8 @@
-      "Force punycode hostnames",
-      "Force punycode in hostnames instead of Unicode when displaying Internationalized Domain Names (IDNs).  ungoogled-chromium flag.",
-      kOsAll, SINGLE_VALUE_TYPE("force-punycode-hostnames")},
-+    {"show-avatar-button",
-+     "Show avatar/people/profile button",
-+     "Show avatar/people/profile button in the browser toolbar.  ungoogled-chromium flag.",
-+     kOsDesktop, MULTI_VALUE_TYPE(kShowAvatarButtonChoices)},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch
deleted file mode 100644
index 6e19e76..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# Add --enable-stacked-tab-strip and --enable-tab-adjust-layout flags to tweak tab strip behavior
-
---- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc.orig
-+++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
-@@ -83,14 +83,13 @@ using content::WebContents;
- namespace {
- 
- bool DetermineTabStripLayoutStacked(PrefService* prefs, bool* adjust_layout) {
--  *adjust_layout = false;
--  // For ash, always allow entering stacked mode.
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-   *adjust_layout = true;
-   return prefs->GetBoolean(prefs::kTabStripStackedLayout);
- #else
--  return base::CommandLine::ForCurrentProcess()->HasSwitch(
--      switches::kForceStackedTabStripLayout);
-+  *adjust_layout = base::CommandLine::ForCurrentProcess()->HasSwitch("enable-tab-adjust-layout");
-+  return prefs->GetBoolean(prefs::kTabStripStackedLayout) ||
-+      base::CommandLine::ForCurrentProcess()->HasSwitch("enable-stacked-tab-strip");
- #endif
- }
- 
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -8,4 +8,8 @@
-      "SetIpv6ProbeFalse",
-      "Forces the result of the browser's IPv6 probing (i.e. IPv6 connectivity test) to be unsuccessful. This causes IPv4 addresses to be prioritized over IPv6 addresses. Without this flag, the probing result is set to be successful, which causes IPv6 to be used over IPv4 when possible.  ungoogled-chromium flag.",
-      kOsAll, FEATURE_VALUE_TYPE(net::features::kSetIpv6ProbeFalse)},
-+    {"enable-stacked-tab-strip",
-+     "Enable stacking in the tab strip",
-+     "Forces tabs to be stacked in the tab strip. Otherwise, they follow default behavior.  ungoogled-chromium flag.",
-+     kOsAll, SINGLE_VALUE_TYPE("enable-stacked-tab-strip")},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
deleted file mode 100644
index 0bc5dd5..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-# Disables IPv6 probing and adds an option to change the IPv6 probing result
-
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -4,4 +4,8 @@
- 
- #ifndef CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
- #define CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
-+    {"set-ipv6-probe-false",
-+     "SetIpv6ProbeFalse",
-+     "Forces the result of the browser's IPv6 probing (i.e. IPv6 connectivity test) to be unsuccessful. This causes IPv4 addresses to be prioritized over IPv6 addresses. Without this flag, the probing result is set to be successful, which causes IPv6 to be used over IPv4 when possible.  ungoogled-chromium flag.",
-+     kOsAll, FEATURE_VALUE_TYPE(net::features::kSetIpv6ProbeFalse)},
- #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
---- net/base/features.cc.orig
-+++ net/base/features.cc
-@@ -263,5 +263,7 @@ const base::Feature kPartitionedCookies{
- const base::Feature kExtraCookieValidityChecks{
-     "ExtraCookieValidityChecks", base::FEATURE_ENABLED_BY_DEFAULT};
- 
-+const base::Feature kSetIpv6ProbeFalse{"SetIpv6ProbeFalse", base::FEATURE_DISABLED_BY_DEFAULT};
-+
- }  // namespace features
- }  // namespace net
---- net/base/features.h.orig
-+++ net/base/features.h
-@@ -396,6 +396,8 @@ NET_EXPORT extern const base::Feature kP
- // feature flag, assuming no breakage occurs with it enabled.
- NET_EXPORT extern const base::Feature kExtraCookieValidityChecks;
- 
-+NET_EXPORT extern const base::Feature kSetIpv6ProbeFalse;
-+
- }  // namespace features
- }  // namespace net
- 
---- net/dns/host_resolver_manager.cc.orig
-+++ net/dns/host_resolver_manager.cc
-@@ -139,11 +139,6 @@ const unsigned kMinimumTTLSeconds = kCac
- // cached.
- const int kIPv6ProbePeriodMs = 1000;
- 
--// RIPE NCC k.root-servers.net. 2001:7fd::1 (anycasted), used for IPv6 probes.
--const uint8_t kIPv6ProbeAddress[] = {0x20, 0x01, 0x07, 0xfd, 0x00, 0x00,
--                                     0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
--                                     0x00, 0x00, 0x00, 0x01};
--
- enum DnsResolveStatus {
-   RESOLVE_STATUS_DNS_SUCCESS = 0,
-   RESOLVE_STATUS_PROC_SUCCESS,
-@@ -3696,7 +3691,7 @@ bool HostResolverManager::IsIPv6Reachabl
-       (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
-           kIPv6ProbePeriodMs) {
-     SetLastIPv6ProbeResult(
--        IsGloballyReachable(IPAddress(kIPv6ProbeAddress), net_log));
-+        !base::FeatureList::IsEnabled(features::kSetIpv6ProbeFalse));
-     cached = false;
-   }
-   net_log.AddEvent(
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
deleted file mode 100644
index 9ff8cfa..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
+++ /dev/null
@@ -1,461 +0,0 @@
-# Add suggestions URL text field to the search engine editing dialog
-# (chrome://settings/searchEngines).
-
---- chrome/browser/resources/settings/search_engines_page/search_engine_dialog.html.orig
-+++ chrome/browser/resources/settings/search_engines_page/search_engine_dialog.html
-@@ -20,6 +20,13 @@
-             value="{{queryUrl_}}" on-focus="validate_" on-input="validate_"
-             disabled$="[[model.urlLocked]]">
-         </cr-input>
-+        <cr-input id="suggestionsUrl"
-+            label="Suggestions URL with %s in place of query"
-+            error-message="$i18n{notValid}"
-+            value="{{suggestionsUrl_}}"
-+            on-focus="validate_" on-input="validate_"
-+            disabled$="[[model.urlLocked]]">
-+        </cr-input>
-       </div>
-       <div slot="button-container">
-         <cr-button class="cancel-button" on-click="cancel_" id="cancel">
---- chrome/browser/resources/settings/search_engines_page/search_engine_dialog.ts.orig
-+++ chrome/browser/resources/settings/search_engines_page/search_engine_dialog.ts
-@@ -26,6 +26,7 @@ interface SettingsSearchEngineDialogElem
-     dialog: CrDialogElement,
-     keyword: CrInputElement,
-     queryUrl: CrInputElement,
-+    suggestionsUrl: CrInputElement,
-     searchEngine: CrInputElement,
-   };
- }
-@@ -54,6 +55,7 @@ class SettingsSearchEngineDialogElement
-       searchEngine_: String,
-       keyword_: String,
-       queryUrl_: String,
-+      suggestionsUrl_: String,
-       dialogTitle_: String,
-       actionButtonText_: String,
-     };
-@@ -63,6 +65,7 @@ class SettingsSearchEngineDialogElement
-   private searchEngine_: string;
-   private keyword_: string;
-   private queryUrl_: string;
-+  private suggestionsUrl_: string;
-   private dialogTitle_: string;
-   private actionButtonText_: string;
-   private browserProxy_: SearchEnginesBrowserProxy =
-@@ -92,6 +95,7 @@ class SettingsSearchEngineDialogElement
-       this.searchEngine_ = this.model.name;
-       this.keyword_ = this.model.keyword;
-       this.queryUrl_ = this.model.url;
-+      this.suggestionsUrl_ = this.model.suggestionsUrl;
-     } else {
-       this.dialogTitle_ =
-           loadTimeData.getString('searchEnginesAddSearchEngine');
-@@ -127,8 +131,12 @@ class SettingsSearchEngineDialogElement
-       }
-     }
- 
--    [this.$.searchEngine, this.$.keyword, this.$.queryUrl].forEach(
--        element => this.validateElement_(element));
-+    [
-+      this.$.searchEngine,
-+      this.$.keyword,
-+      this.$.queryUrl,
-+      this.$.suggestionsUrl
-+    ].forEach(element => this.validateElement_(element));
-   }
- 
-   private cancel_() {
-@@ -137,7 +145,8 @@ class SettingsSearchEngineDialogElement
- 
-   private onActionButtonTap_() {
-     this.browserProxy_.searchEngineEditCompleted(
--        this.searchEngine_, this.keyword_, this.queryUrl_);
-+        this.searchEngine_, this.keyword_, this.queryUrl_,
-+        this.suggestionsUrl_);
-     this.$.dialog.close();
-   }
- 
-@@ -165,9 +174,11 @@ class SettingsSearchEngineDialogElement
- 
-   private updateActionButtonState_() {
-     const allValid = [
--      this.$.searchEngine, this.$.keyword, this.$.queryUrl
-+      this.$.searchEngine, this.$.keyword, this.$.queryUrl,
-+      this.$.suggestionsUrl
-     ].every(function(inputElement) {
--      return !inputElement.invalid && inputElement.value.length > 0;
-+      return !inputElement.invalid && (inputElement.value.length > 0 ||
-+          inputElement.id == 'suggestionsUrl');
-     });
-     this.$.actionButton.disabled = !allValid;
-   }
---- chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts.orig
-+++ chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
-@@ -30,6 +30,7 @@ export type SearchEngine = {
-   modelIndex: number,
-   name: string,
-   url: string,
-+  suggestionsUrl: string,
-   urlLocked: boolean,
- };
- 
-@@ -53,7 +54,7 @@ export interface SearchEnginesBrowserPro
-   searchEngineEditCancelled(): void;
- 
-   searchEngineEditCompleted(
--      searchEngine: string, keyword: string, queryUrl: string): void;
-+      searchEngine: string, keyword: string, queryUrl: string, suggestionsUrl: string): void;
- 
-   getSearchEnginesList(): Promise<SearchEnginesInfo>;
- 
-@@ -84,11 +85,12 @@ export class SearchEnginesBrowserProxyIm
-   }
- 
-   searchEngineEditCompleted(
--      searchEngine: string, keyword: string, queryUrl: string) {
-+      searchEngine: string, keyword: string, queryUrl: string, suggestionsUrl: string) {
-     chrome.send('searchEngineEditCompleted', [
-       searchEngine,
-       keyword,
-       queryUrl,
-+      suggestionsUrl,
-     ]);
-   }
- 
---- chrome/browser/ui/search_engines/edit_search_engine_controller.cc.orig
-+++ chrome/browser/ui/search_engines/edit_search_engine_controller.cc
-@@ -67,6 +67,15 @@ bool EditSearchEngineController::IsURLVa
-       .is_valid();
- }
- 
-+bool EditSearchEngineController::IsSuggestionsURLValid(
-+    const std::string& suggestions_url_input) const {
-+  std::string suggestions_url = GetFixedUpURL(suggestions_url_input);
-+  if (suggestions_url.empty())
-+    return true;
-+
-+  return IsURLValid(suggestions_url);
-+}
-+
- bool EditSearchEngineController::IsKeywordValid(
-     const std::u16string& keyword_input) const {
-   std::u16string keyword_input_trimmed(
-@@ -89,10 +98,12 @@ bool EditSearchEngineController::IsKeywo
- void EditSearchEngineController::AcceptAddOrEdit(
-     const std::u16string& title_input,
-     const std::u16string& keyword_input,
--    const std::string& url_input) {
-+    const std::string& url_input,
-+    const std::string& suggestions_url_input) {
-   DCHECK(!keyword_input.empty());
-   std::string url_string = GetFixedUpURL(url_input);
-   DCHECK(!url_string.empty());
-+  std::string suggestions_url = GetFixedUpURL(suggestions_url_input);
- 
-   TemplateURLService* template_url_service =
-       TemplateURLServiceFactory::GetForProfile(profile_);
-@@ -120,7 +131,8 @@ void EditSearchEngineController::AcceptA
-   } else {
-     // Adding or modifying an entry via the Delegate.
-     edit_keyword_delegate_->OnEditedKeyword(template_url_, title_input,
--                                            keyword_input, url_string);
-+                                            keyword_input, url_string,
-+                                            suggestions_url);
-   }
- }
- 
---- chrome/browser/ui/search_engines/edit_search_engine_controller.h.orig
-+++ chrome/browser/ui/search_engines/edit_search_engine_controller.h
-@@ -23,7 +23,8 @@ class EditSearchEngineControllerDelegate
-   virtual void OnEditedKeyword(TemplateURL* template_url,
-                                const std::u16string& title,
-                                const std::u16string& keyword,
--                               const std::string& url) = 0;
-+                               const std::string& url,
-+                               const std::string& suggestions_url) = 0;
- 
-  protected:
-   virtual ~EditSearchEngineControllerDelegate() {}
-@@ -54,6 +55,8 @@ class EditSearchEngineController {
-   // character results in a valid url.
-   bool IsURLValid(const std::string& url_input) const;
- 
-+  bool IsSuggestionsURLValid(const std::string& suggestions_url_input) const;
-+
-   // Returns true if the value of |keyword_input| represents a valid keyword.
-   // The keyword is valid if it is non-empty and does not conflict with an
-   // existing entry. NOTE: this is just the keyword, not the title and url.
-@@ -62,7 +65,8 @@ class EditSearchEngineController {
-   // Completes the add or edit of a search engine.
-   void AcceptAddOrEdit(const std::u16string& title_input,
-                        const std::u16string& keyword_input,
--                       const std::string& url_input);
-+                       const std::string& url_input,
-+                       const std::string& suggestions_url_input);
- 
-   // Deletes an unused TemplateURL, if its add was cancelled and it's not
-   // already owned by the TemplateURLService.
---- chrome/browser/ui/search_engines/keyword_editor_controller.cc.orig
-+++ chrome/browser/ui/search_engines/keyword_editor_controller.cc
-@@ -21,23 +21,27 @@ KeywordEditorController::KeywordEditorCo
- KeywordEditorController::~KeywordEditorController() {
- }
- 
--int KeywordEditorController::AddTemplateURL(const std::u16string& title,
--                                            const std::u16string& keyword,
--                                            const std::string& url) {
-+int KeywordEditorController::AddTemplateURL(
-+    const std::u16string& title,
-+    const std::u16string& keyword,
-+    const std::string& url,
-+    const std::string& suggestions_url) {
-   DCHECK(!url.empty());
- 
-   base::RecordAction(UserMetricsAction("KeywordEditor_AddKeyword"));
- 
-   const int new_index = table_model_->last_other_engine_index();
--  table_model_->Add(new_index, title, keyword, url);
-+  table_model_->Add(new_index, title, keyword, url, suggestions_url);
- 
-   return new_index;
- }
- 
--void KeywordEditorController::ModifyTemplateURL(TemplateURL* template_url,
--                                                const std::u16string& title,
--                                                const std::u16string& keyword,
--                                                const std::string& url) {
-+void KeywordEditorController::ModifyTemplateURL(
-+    TemplateURL* template_url,
-+    const std::u16string& title,
-+    const std::u16string& keyword,
-+    const std::string& url,
-+    const std::string& suggestions_url) {
-   DCHECK(!url.empty());
-   const int index = table_model_->IndexOfTemplateURL(template_url);
-   if (index == -1) {
-@@ -48,10 +52,12 @@ void KeywordEditorController::ModifyTemp
- 
-   // Don't do anything if the entry didn't change.
-   if ((template_url->short_name() == title) &&
--      (template_url->keyword() == keyword) && (template_url->url() == url))
-+      (template_url->keyword() == keyword) &&
-+      (template_url->url() == url) &&
-+      (template_url->suggestions_url() == suggestions_url))
-     return;
- 
--  table_model_->ModifyTemplateURL(index, title, keyword, url);
-+  table_model_->ModifyTemplateURL(index, title, keyword, url, suggestions_url);
- 
-   base::RecordAction(UserMetricsAction("KeywordEditor_ModifiedKeyword"));
- }
---- chrome/browser/ui/search_engines/keyword_editor_controller.h.orig
-+++ chrome/browser/ui/search_engines/keyword_editor_controller.h
-@@ -29,14 +29,16 @@ class KeywordEditorController {
-   // model.  Returns the index of the added URL.
-   int AddTemplateURL(const std::u16string& title,
-                      const std::u16string& keyword,
--                     const std::string& url);
-+                     const std::string& url,
-+                     const std::string& suggestions_url);
- 
-   // Invoked when the user modifies a TemplateURL. Updates the
-   // TemplateURLService and table model appropriately.
-   void ModifyTemplateURL(TemplateURL* template_url,
-                          const std::u16string& title,
-                          const std::u16string& keyword,
--                         const std::string& url);
-+                         const std::string& url,
-+                         const std::string& suggestions_url);
- 
-   // Return true if the given |url| can be edited.
-   bool CanEdit(const TemplateURL* url) const;
---- chrome/browser/ui/search_engines/template_url_table_model.cc.orig
-+++ chrome/browser/ui/search_engines/template_url_table_model.cc
-@@ -109,21 +109,25 @@ void TemplateURLTableModel::Remove(int i
- void TemplateURLTableModel::Add(int index,
-                                 const std::u16string& short_name,
-                                 const std::u16string& keyword,
--                                const std::string& url) {
-+                                const std::string& url,
-+                                const std::string& suggestions_url) {
-   DCHECK(index >= 0 && index <= RowCount());
-   DCHECK(!url.empty());
-   TemplateURLData data;
-   data.SetShortName(short_name);
-   data.SetKeyword(keyword);
-   data.SetURL(url);
-+  data.suggestions_url = suggestions_url;
-   data.is_active = TemplateURLData::ActiveStatus::kTrue;
-   template_url_service_->Add(std::make_unique<TemplateURL>(data));
- }
- 
--void TemplateURLTableModel::ModifyTemplateURL(int index,
--                                              const std::u16string& title,
--                                              const std::u16string& keyword,
--                                              const std::string& url) {
-+void TemplateURLTableModel::ModifyTemplateURL(
-+    int index,
-+    const std::u16string& title,
-+    const std::u16string& keyword,
-+    const std::string& url,
-+    const std::string& suggestions_url) {
-   DCHECK(index >= 0 && index <= RowCount());
-   DCHECK(!url.empty());
-   TemplateURL* template_url = GetTemplateURL(index);
-@@ -132,7 +136,8 @@ void TemplateURLTableModel::ModifyTempla
-   DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
-          template_url->SupportsReplacement(
-              template_url_service_->search_terms_data()));
--  template_url_service_->ResetTemplateURL(template_url, title, keyword, url);
-+  template_url_service_->ResetTemplateURL(template_url, title, keyword, url,
-+                                          suggestions_url);
- }
- 
- TemplateURL* TemplateURLTableModel::GetTemplateURL(int index) {
---- chrome/browser/ui/search_engines/template_url_table_model.h.orig
-+++ chrome/browser/ui/search_engines/template_url_table_model.h
-@@ -54,13 +54,15 @@ class TemplateURLTableModel : public ui:
-   void Add(int index,
-            const std::u16string& short_name,
-            const std::u16string& keyword,
--           const std::string& url);
-+           const std::string& url,
-+           const std::string& suggestions_url);
- 
-   // Update the entry at the specified index.
-   void ModifyTemplateURL(int index,
-                          const std::u16string& title,
-                          const std::u16string& keyword,
--                         const std::string& url);
-+                         const std::string& url,
-+                         const std::string& suggestions_url);
- 
-   // Reloads the icon at the specified index.
-   void ReloadIcon(int index);
---- chrome/browser/ui/webui/settings/search_engines_handler.cc.orig
-+++ chrome/browser/ui/webui/settings/search_engines_handler.cc
-@@ -37,6 +37,7 @@ namespace {
- const char kSearchEngineField[] = "searchEngine";
- const char kKeywordField[] = "keyword";
- const char kQueryUrlField[] = "queryUrl";
-+const char kSuggestionsUrlField[] = "suggestionsUrl";
- 
- // Dummy number used for indicating that a new search engine is added.
- const int kNewSearchEngineIndex = -1;
-@@ -212,6 +213,9 @@ SearchEnginesHandler::CreateDictionaryFo
-   Profile* profile = Profile::FromWebUI(web_ui());
-   dict->SetString(
-       "url", template_url->url_ref().DisplayURL(UIThreadSearchTermsData()));
-+  dict->SetString("suggestionsUrl",
-+                  template_url->suggestions_url_ref().DisplayURL(
-+                      UIThreadSearchTermsData()));
-   dict->SetBoolean("urlLocked", template_url->prepopulate_id() > 0);
-   GURL icon_url = template_url->favicon_url();
-   if (icon_url.is_valid())
-@@ -325,12 +329,14 @@ void SearchEnginesHandler::HandleSearchE
- void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url,
-                                            const std::u16string& title,
-                                            const std::u16string& keyword,
--                                           const std::string& url) {
-+                                           const std::string& url,
-+                                           const std::string& suggestions_url) {
-   DCHECK(!url.empty());
-   if (template_url)
--    list_controller_.ModifyTemplateURL(template_url, title, keyword, url);
-+    list_controller_.ModifyTemplateURL(template_url, title, keyword, url,
-+                                       suggestions_url);
-   else
--    list_controller_.AddTemplateURL(title, keyword, url);
-+    list_controller_.AddTemplateURL(title, keyword, url, suggestions_url);
- 
-   edit_controller_.reset();
- }
-@@ -361,6 +367,8 @@ bool SearchEnginesHandler::CheckFieldVal
-     is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value));
-   else if (field_name.compare(kQueryUrlField) == 0)
-     is_valid = edit_controller_->IsURLValid(field_value);
-+  else if (field_name.compare(kSuggestionsUrlField) == 0)
-+    is_valid = edit_controller_->IsSuggestionsURLValid(field_value);
-   else
-     NOTREACHED();
- 
-@@ -382,17 +390,21 @@ void SearchEnginesHandler::HandleSearchE
-   std::string search_engine;
-   std::string keyword;
-   std::string query_url;
-+  std::string suggestions_url;
-   CHECK(args->GetString(0, &search_engine));
-   CHECK(args->GetString(1, &keyword));
-   CHECK(args->GetString(2, &query_url));
-+  CHECK(args->GetString(3, &suggestions_url));
- 
-   // Recheck validity. It's possible to get here with invalid input if e.g. the
-   // user calls the right JS functions directly from the web inspector.
-   if (CheckFieldValidity(kSearchEngineField, search_engine) &&
-       CheckFieldValidity(kKeywordField, keyword) &&
--      CheckFieldValidity(kQueryUrlField, query_url)) {
-+      CheckFieldValidity(kQueryUrlField, query_url) &&
-+      CheckFieldValidity(kSuggestionsUrlField, suggestions_url)) {
-     edit_controller_->AcceptAddOrEdit(base::UTF8ToUTF16(search_engine),
--                                      base::UTF8ToUTF16(keyword), query_url);
-+                                      base::UTF8ToUTF16(keyword),
-+                                      query_url, suggestions_url);
-   }
- }
- 
---- chrome/browser/ui/webui/settings/search_engines_handler.h.orig
-+++ chrome/browser/ui/webui/settings/search_engines_handler.h
-@@ -50,7 +50,8 @@ class SearchEnginesHandler : public Sett
-   void OnEditedKeyword(TemplateURL* template_url,
-                        const std::u16string& title,
-                        const std::u16string& keyword,
--                       const std::string& url) override;
-+                       const std::string& url,
-+                       const std::string& suggestions_url) override;
- 
-   // SettingsPageUIHandler implementation.
-   void RegisterMessages() override;
-@@ -82,8 +83,8 @@ class SearchEnginesHandler : public Sett
-   // to WebUI. Called from WebUI.
-   void HandleValidateSearchEngineInput(const base::ListValue* args);
- 
--  // Checks whether the given user input field (searchEngine, keyword, queryUrl)
--  // is populated with a valid value.
-+  // Checks whether the given user input field (searchEngine, keyword, queryUrl,
-+  // suggestionsUrl) is populated with a valid value.
-   bool CheckFieldValidity(const std::string& field_name,
-                           const std::string& field_value);
- 
---- components/search_engines/template_url_service.cc.orig
-+++ components/search_engines/template_url_service.cc
-@@ -641,7 +641,8 @@ void TemplateURLService::IncrementUsageC
- void TemplateURLService::ResetTemplateURL(TemplateURL* url,
-                                           const std::u16string& title,
-                                           const std::u16string& keyword,
--                                          const std::string& search_url) {
-+                                          const std::string& search_url,
-+                                          const std::string& suggestions_url) {
-   DCHECK(!IsCreatedByExtension(url));
-   DCHECK(!keyword.empty());
-   DCHECK(!search_url.empty());
-@@ -656,6 +657,7 @@ void TemplateURLService::ResetTemplateUR
-   data.safe_for_autoreplace = false;
-   data.last_modified = clock_->Now();
-   data.is_active = TemplateURLData::ActiveStatus::kTrue;
-+  data.suggestions_url = suggestions_url;
- 
-   Update(url, TemplateURL(data));
- }
---- components/search_engines/template_url_service.h.orig
-+++ components/search_engines/template_url_service.h
-@@ -253,7 +253,8 @@ class TemplateURLService : public WebDat
-   void ResetTemplateURL(TemplateURL* url,
-                         const std::u16string& title,
-                         const std::u16string& keyword,
--                        const std::string& search_url);
-+                        const std::string& search_url,
-+                        const std::string& suggestions_url);
- 
-   // Sets the `is_active` field of the specified TemplateURL to `kTrue` or
-   // `kFalse`. Called when a user explicitly activates/deactivates the search
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch
deleted file mode 100644
index 4a78da1..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- chrome/browser/about_flags.cc.orig
-+++ chrome/browser/about_flags.cc
-@@ -2728,7 +2728,13 @@ const FeatureEntry::FeatureVariation kWi
- // calculate and verify checksum.
- //
- // When adding a new choice, add it to the end of the list.
-+#include "chrome/browser/ungoogled_flag_choices.h"
-+#include "chrome/browser/bromite_flag_choices.h"
-+#include "chrome/browser/ungoogled_platform_flag_choices.h"
- const FeatureEntry kFeatureEntries[] = {
-+#include "chrome/browser/ungoogled_flag_entries.h"
-+#include "chrome/browser/bromite_flag_entries.h"
-+#include "chrome/browser/ungoogled_platform_flag_entries.h"
- // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
- // //tools/flags/generate_unexpire_flags.py.
- #include "build/chromeos_buildflags.h"
---- /dev/null
-+++ chrome/browser/bromite_flag_choices.h
-@@ -0,0 +1,7 @@
-+// Copyright (c) 2020 The ungoogled-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.
-+
-+#ifndef CHROME_BROWSER_BROMITE_FLAG_CHOICES_H_
-+#define CHROME_BROWSER_BROMITE_FLAG_CHOICES_H_
-+#endif  // CHROME_BROWSER_BROMITE_FLAG_CHOICES_H_
---- /dev/null
-+++ chrome/browser/bromite_flag_entries.h
-@@ -0,0 +1,7 @@
-+// Copyright (c) 2020 The ungoogled-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.
-+
-+#ifndef CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
-+#define CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
-+#endif  // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
---- /dev/null
-+++ chrome/browser/ungoogled_flag_choices.h
-@@ -0,0 +1,7 @@
-+// Copyright (c) 2020 The ungoogled-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.
-+
-+#ifndef CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
-+#define CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
-+#endif  // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
---- /dev/null
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -0,0 +1,7 @@
-+// Copyright (c) 2020 The ungoogled-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.
-+
-+#ifndef CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
-+#define CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
-+#endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
---- /dev/null
-+++ chrome/browser/ungoogled_platform_flag_choices.h
-@@ -0,0 +1,7 @@
-+// Copyright (c) 2020 The ungoogled-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.
-+
-+#ifndef CHROME_BROWSER_UNGOOGLED_PLATFORM_FLAG_CHOICES_H_
-+#define CHROME_BROWSER_UNGOOGLED_PLATFORM_FLAG_CHOICES_H_
-+#endif  // CHROME_BROWSER_UNGOOGLED_PLATFORM_FLAG_CHOICES_H_
---- /dev/null
-+++ chrome/browser/ungoogled_platform_flag_entries.h
-@@ -0,0 +1,7 @@
-+// Copyright (c) 2020 The ungoogled-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.
-+
-+#ifndef CHROME_BROWSER_UNGOOGLED_PLATFORM_FLAG_ENTRIES_H_
-+#define CHROME_BROWSER_UNGOOGLED_PLATFORM_FLAG_ENTRIES_H_
-+#endif  // CHROME_BROWSER_UNGOOGLED_PLATFORM_FLAG_ENTRIES_H_
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch
deleted file mode 100644
index fab5b74..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# Disables the dial registry's repeating discovery timer
-# This caused unnecessary SSDP network spam
-
---- chrome/browser/media/router/discovery/dial/dial_registry.cc.orig
-+++ chrome/browser/media/router/discovery/dial/dial_registry.cc
-@@ -190,10 +190,6 @@ void DialRegistry::StartPeriodicDiscover
- 
-   dial_ = CreateDialService();
-   dial_->AddObserver(this);
--  DoDiscovery();
--  repeating_timer_ = std::make_unique<base::RepeatingTimer>();
--  repeating_timer_->Start(FROM_HERE, refresh_interval_delta_, this,
--                          &DialRegistry::DoDiscovery);
- }
- 
- void DialRegistry::DoDiscovery() {
-@@ -207,8 +203,6 @@ void DialRegistry::StopPeriodicDiscovery
-   if (!dial_)
-     return;
- 
--  repeating_timer_->Stop();
--  repeating_timer_.reset();
-   dial_->RemoveObserver(this);
-   ClearDialService();
- }
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
deleted file mode 100644
index 2191bbe..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/disable-download-quarantine.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-# Disables file download quarantining
-
---- components/download/internal/common/base_file.cc.orig
-+++ components/download/internal/common/base_file.cc
-@@ -23,7 +23,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
- }
- #endif  // defined(OS_ANDROID)
- 
--namespace {
--
--DownloadInterruptReason QuarantineFileResultToReason(
--    quarantine::mojom::QuarantineFileResult result) {
--  switch (result) {
--    case quarantine::mojom::QuarantineFileResult::OK:
--      return DOWNLOAD_INTERRUPT_REASON_NONE;
--    case quarantine::mojom::QuarantineFileResult::VIRUS_INFECTED:
--      return DOWNLOAD_INTERRUPT_REASON_FILE_VIRUS_INFECTED;
--    case quarantine::mojom::QuarantineFileResult::SECURITY_CHECK_FAILED:
--      return DOWNLOAD_INTERRUPT_REASON_FILE_SECURITY_CHECK_FAILED;
--    case quarantine::mojom::QuarantineFileResult::BLOCKED_BY_POLICY:
--      return DOWNLOAD_INTERRUPT_REASON_FILE_BLOCKED;
--    case quarantine::mojom::QuarantineFileResult::ACCESS_DENIED:
--      return DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED;
--
--    case quarantine::mojom::QuarantineFileResult::FILE_MISSING:
--      // Don't have a good interrupt reason here. This return code means that
--      // the file at |full_path_| went missing before QuarantineFile got to
--      // look at it. Not expected to happen, but we've seen instances where a
--      // file goes missing immediately after BaseFile closes the handle.
--      //
--      // Intentionally using a different error message than
--      // SECURITY_CHECK_FAILED in order to distinguish the two.
--      return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED;
--
--    case quarantine::mojom::QuarantineFileResult::ANNOTATION_FAILED:
--      // This means that the mark-of-the-web couldn't be applied. The file is
--      // already on the file system under its final target name.
--      //
--      // Causes of failed annotations typically aren't transient. E.g. the
--      // target file system may not support extended attributes or alternate
--      // streams. We are going to allow these downloads to progress on the
--      // assumption that failures to apply MOTW can't reliably be introduced
--      // remotely.
--      return DOWNLOAD_INTERRUPT_REASON_NONE;
--  }
--  return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED;
--}
--
--// Given a source and a referrer, determines the "safest" URL that can be used
--// to determine the authority of the download source. Returns an empty URL if no
--// HTTP/S URL can be determined for the <|source_url|, |referrer_url|> pair.
--GURL GetEffectiveAuthorityURL(const GURL& source_url,
--                              const GURL& referrer_url) {
--  if (source_url.is_valid()) {
--    // http{,s} has an authority and are supported.
--    if (source_url.SchemeIsHTTPOrHTTPS())
--      return source_url;
--
--    // If the download source is file:// ideally we should copy the MOTW from
--    // the original file, but given that Chrome/Chromium places strict
--    // restrictions on which schemes can reference file:// URLs, this code is
--    // going to assume that at this point it's okay to treat this download as
--    // being from the local system.
--    if (source_url.SchemeIsFile())
--      return source_url;
--
--    // ftp:// has an authority.
--    if (source_url.SchemeIs(url::kFtpScheme))
--      return source_url;
--
--    if (source_url.SchemeIs(url::kBlobScheme))
--      return url::Origin::Create(source_url).GetURL();
--  }
--
--  if (referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS())
--    return referrer_url;
--
--  return GURL();
--}
--
--}  // namespace
--
--void BaseFile::OnFileQuarantined(
--    bool connection_error,
--    quarantine::mojom::QuarantineFileResult result) {
--  base::UmaHistogramBoolean("Download.QuarantineService.ConnectionError",
--                            connection_error);
--
--  DCHECK(on_annotation_done_callback_);
--  quarantine_service_.reset();
--  std::move(on_annotation_done_callback_)
--      .Run(QuarantineFileResultToReason(result));
--}
--
--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)
--
--  CHECK(false) << "In-process quarantine service should not have failed.";
--}
- 
- void BaseFile::AnnotateWithSourceInformation(
-     const std::string& client_guid,
-@@ -641,32 +541,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)
--    quarantine::mojom::QuarantineFileResult result =
--        quarantine::SetInternetZoneIdentifierDirectly(full_path_, authority_url,
--                                                      referrer_url);
--#else
--    quarantine::mojom::QuarantineFileResult result =
--        quarantine::mojom::QuarantineFileResult::ANNOTATION_FAILED;
--#endif
--    std::move(on_annotation_done_callback)
--        .Run(QuarantineFileResultToReason(result));
--  } else {
--    quarantine_service_.Bind(std::move(remote_quarantine));
--
--    on_annotation_done_callback_ = std::move(on_annotation_done_callback);
--
--    quarantine_service_.set_disconnect_handler(base::BindOnce(
--        &BaseFile::OnQuarantineServiceError, weak_factory_.GetWeakPtr(),
--        authority_url, referrer_url));
--
--    quarantine_service_->QuarantineFile(
--        full_path_, authority_url, referrer_url, client_guid,
--        base::BindOnce(&BaseFile::OnFileQuarantined, weak_factory_.GetWeakPtr(),
--                       false));
--  }
-+  std::move(on_annotation_done_callback)
-+      .Run(DOWNLOAD_INTERRUPT_REASON_NONE);
- }
- 
- }  // namespace download
---- content/browser/BUILD.gn.orig
-+++ content/browser/BUILD.gn
-@@ -82,7 +82,6 @@ source_set("browser") {
-     "//components/permissions:permissions_common",
-     "//components/power_scheduler",
-     "//components/services/filesystem:lib",
--    "//components/services/quarantine:quarantine",
-     "//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"
- #include "base/threading/sequenced_task_runner_handle.h"
- #include "build/build_config.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(
-   // 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;
--  if (RequireSecurityChecks()) {
--    GURL referrer_url = manager_->is_off_the_record() ? GURL() : context_.url;
--    mojo::Remote<quarantine::mojom::Quarantine> quarantine_remote;
--    if (quarantine_connection_callback_) {
--      quarantine_connection_callback_.Run(
--          quarantine_remote.BindNewPipeAndPassReceiver());
--    }
--    result_callback = base::BindOnce(
--        &SafeMoveHelper::DidFileDoQuarantine, weak_factory_.GetWeakPtr(),
--        dest_url(), referrer_url, std::move(quarantine_remote));
--  } else {
-     result_callback = base::BindOnce(&SafeMoveHelper::DidFileSkipQuarantine,
-                                      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
- void SafeMoveHelper::DidFileDoQuarantine(
-     const storage::FileSystemURL& target_url,
-     const GURL& referrer_url,
--    mojo::Remote<quarantine::mojom::Quarantine> quarantine_remote,
-     base::File::Error result) {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- 
-@@ -251,37 +237,9 @@ void SafeMoveHelper::DidFileDoQuarantine
-       referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS()
-           ? referrer_url
-           : GURL();
--
--  if (quarantine_remote) {
--    quarantine::mojom::Quarantine* raw_quarantine = quarantine_remote.get();
--    raw_quarantine->QuarantineFile(
--        target_url.path(), authority_url, referrer_url,
--        GetContentClient()
--            ->browser()
--            ->GetApplicationClientGUIDForQuarantineCheck(),
--        mojo::WrapCallbackWithDefaultInvokeIfNotRun(
--            base::BindOnce(&SafeMoveHelper::DidAnnotateFile,
--                           weak_factory_.GetWeakPtr(),
--                           std::move(quarantine_remote)),
--            quarantine::mojom::QuarantineFileResult::ANNOTATION_FAILED));
--  } else {
--#if defined(OS_WIN)
--    base::ThreadPool::PostTaskAndReplyWithResult(
--        FROM_HERE, {base::MayBlock()},
--        base::BindOnce(&quarantine::SetInternetZoneIdentifierDirectly,
--                       target_url.path(), authority_url, referrer_url),
--        base::BindOnce(&SafeMoveHelper::DidAnnotateFile,
--                       weak_factory_.GetWeakPtr(),
--                       std::move(quarantine_remote)));
--#else
--    DidAnnotateFile(std::move(quarantine_remote),
--                    quarantine::mojom::QuarantineFileResult::ANNOTATION_FAILED);
--#endif
--  }
- }
- 
- void SafeMoveHelper::DidAnnotateFile(
--    mojo::Remote<quarantine::mojom::Quarantine> quarantine_remote,
-     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
-@@ -58,10 +58,8 @@ class CONTENT_EXPORT SafeMoveHelper {
-   void DidFileDoQuarantine(
-       const storage::FileSystemURL& target_url,
-       const GURL& referrer_url,
--      mojo::Remote<quarantine::mojom::Quarantine> quarantine_remote,
-       base::File::Error result);
-   void DidAnnotateFile(
--      mojo::Remote<quarantine::mojom::Quarantine> quarantine_remote,
-       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
-@@ -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 0
-   // Quarantining a file before its contents are available is only supported on
-   // Windows and Linux.
-   if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) {
-@@ -490,7 +490,7 @@ void PepperFileIOHost::OnLocalFileOpened
- #endif
- }
- 
--#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-+#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
-@@ -13,7 +13,6 @@
- #include "base/macros.h"
- #include "base/memory/ref_counted.h"
- #include "base/memory/weak_ptr.h"
--#include "components/services/quarantine/public/mojom/quarantine.mojom.h"
- #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
- #include "ipc/ipc_listener.h"
- #include "ipc/ipc_platform_file.h"
-@@ -93,12 +92,6 @@ class PepperFileIOHost : public ppapi::h
-                          const base::FilePath& path,
-                          base::File::Error error_code);
- 
--  void OnLocalFileQuarantined(
--      ppapi::host::ReplyMessageContext reply_context,
--      const base::FilePath& path,
--      mojo::Remote<quarantine::mojom::Quarantine> quarantine_remote,
--      quarantine::mojom::QuarantineFileResult quarantine_result);
--
-   void SendFileOpenReply(ppapi::host::ReplyMessageContext reply_context,
-                          base::File::Error error_code);
- 
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch
deleted file mode 100644
index f9f6449..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# Disables omission of URL elements in Omnibox
-
---- components/url_formatter/url_formatter.cc.orig
-+++ components/url_formatter/url_formatter.cc
-@@ -463,14 +463,14 @@ ComponentResult IDNToUnicodeOneComponent
- }  // namespace
- 
- const FormatUrlType kFormatUrlOmitNothing = 0;
--const FormatUrlType kFormatUrlOmitUsernamePassword = 1 << 0;
--const FormatUrlType kFormatUrlOmitHTTP = 1 << 1;
--const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2;
--const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
--const FormatUrlType kFormatUrlOmitTrivialSubdomains = 1 << 5;
--const FormatUrlType kFormatUrlTrimAfterHost = 1 << 6;
--const FormatUrlType kFormatUrlOmitFileScheme = 1 << 7;
--const FormatUrlType kFormatUrlOmitMailToScheme = 1 << 8;
-+const FormatUrlType kFormatUrlOmitUsernamePassword = 0 << 0;
-+const FormatUrlType kFormatUrlOmitHTTP = 0 << 1;
-+const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0 << 2;
-+const FormatUrlType kFormatUrlOmitHTTPS = 0 << 3;
-+const FormatUrlType kFormatUrlOmitTrivialSubdomains = 0 << 5;
-+const FormatUrlType kFormatUrlTrimAfterHost = 0 << 6;
-+const FormatUrlType kFormatUrlOmitFileScheme = 0 << 7;
-+const FormatUrlType kFormatUrlOmitMailToScheme = 0 << 8;
- 
- const FormatUrlType kFormatUrlOmitDefaults =
-     kFormatUrlOmitUsernamePassword | kFormatUrlOmitHTTP |
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch
deleted file mode 100644
index f264b5d..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Disables the intranet redirect detector. It generates extra DNS requests and the functionality using this is disabled
-# See this page for more information: https://mikewest.org/2012/02/chrome-connects-to-three-random-domains-at-startup
-
---- chrome/browser/intranet_redirect_detector.cc.orig
-+++ chrome/browser/intranet_redirect_detector.cc
-@@ -119,9 +119,7 @@ void IntranetRedirectDetector::FinishSle
-   simple_loaders_.clear();
-   resulting_origins_.clear();
- 
--  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
--  if (cmd_line->HasSwitch(switches::kDisableBackgroundNetworking))
--    return;
-+  return;
- 
-   DCHECK(simple_loaders_.empty() && resulting_origins_.empty());
- 
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch
deleted file mode 100644
index 2896a43..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# Return blank values for WebGLDebugRendererInfo to remove a potential data
-# leak while preventing potential website breakage
-
---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig
-+++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -3595,8 +3595,7 @@ ScriptValue WebGLRenderingContextBase::g
-               pname, IdentifiabilityBenignStringToken(
-                          String(ContextGL()->GetString(GL_RENDERER))));
-         }
--        return WebGLAny(script_state,
--                        String(ContextGL()->GetString(GL_RENDERER)));
-+        return WebGLAny(script_state, String(""));
-       }
-       SynthesizeGLError(
-           GL_INVALID_ENUM, "getParameter",
-@@ -3610,8 +3609,7 @@ ScriptValue WebGLRenderingContextBase::g
-               pname, IdentifiabilityBenignStringToken(
-                          String(ContextGL()->GetString(GL_VENDOR))));
-         }
--        return WebGLAny(script_state,
--                        String(ContextGL()->GetString(GL_VENDOR)));
-+        return WebGLAny(script_state, String(""));
-       }
-       SynthesizeGLError(
-           GL_INVALID_ENUM, "getParameter",
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch
deleted file mode 100644
index 4ea4498..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Enable chrome://flags/#prefetch-privacy-changes by default
-
---- third_party/blink/common/features.cc.orig
-+++ third_party/blink/common/features.cc
-@@ -416,7 +416,7 @@ const base::Feature kComputePressure{"Co
- // Prefetch request properties are updated to be privacy-preserving. See
- // crbug.com/988956.
- const base::Feature kPrefetchPrivacyChanges{"PrefetchPrivacyChanges",
--                                            base::FEATURE_DISABLED_BY_DEFAULT};
-+                                            base::FEATURE_ENABLED_BY_DEFAULT};
- 
- // Decodes jpeg 4:2:0 formatted images to YUV instead of RGBX and stores in this
- // format in the image decode cache. See crbug.com/919627 for details on the
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch
deleted file mode 100644
index 5f87fc2..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Add ability to always open dev context menu on reload button.
-
---- chrome/browser/ui/views/toolbar/reload_button.cc.orig
-+++ chrome/browser/ui/views/toolbar/reload_button.cc
-@@ -84,7 +84,7 @@ bool ReloadButton::GetMenuEnabled() cons
- }
- 
- void ReloadButton::SetMenuEnabled(bool enable) {
--  menu_enabled_ = enable;
-+  menu_enabled_ = true;
- }
- 
- void ReloadButton::OnMouseExited(const ui::MouseEvent& event) {
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch
deleted file mode 100644
index a983beb..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-# Add more URL schemes allowed for saving
-
---- chrome/browser/ui/browser_commands.cc.orig
-+++ chrome/browser/ui/browser_commands.cc
-@@ -440,11 +440,6 @@ int GetContentRestrictions(const Browser
-     CoreTabHelper* core_tab_helper =
-         CoreTabHelper::FromWebContents(current_tab);
-     content_restrictions = core_tab_helper->content_restrictions();
--    NavigationEntry* last_committed_entry =
--        current_tab->GetController().GetLastCommittedEntry();
--    if (!content::IsSavableURL(
--            last_committed_entry ? last_committed_entry->GetURL() : GURL()))
--      content_restrictions |= CONTENT_RESTRICTION_SAVE;
-   }
-   return content_restrictions;
- }
-@@ -1342,8 +1337,7 @@ bool CanSavePage(const Browser* browser)
-           prefs::kAllowFileSelectionDialogs)) {
-     return false;
-   }
--  return !browser->is_type_devtools() &&
--         !(GetContentRestrictions(browser) & CONTENT_RESTRICTION_SAVE);
-+  return true;
- }
- 
- void Print(Browser* browser) {
---- components/offline_pages/core/offline_page_model.cc.orig
-+++ components/offline_pages/core/offline_page_model.cc
-@@ -22,7 +22,7 @@ OfflinePageModel::SavePageParams::~SaveP
- 
- // static
- bool OfflinePageModel::CanSaveURL(const GURL& url) {
--  return url.is_valid() && url.SchemeIsHTTPOrHTTPS();
-+  return url.is_valid();
- }
- 
- OfflinePageModel::OfflinePageModel() = default;
---- content/common/url_schemes.cc.orig
-+++ content/common/url_schemes.cc
-@@ -23,6 +23,9 @@ namespace {
- bool g_registered_url_schemes = false;
- 
- const char* const kDefaultSavableSchemes[] = {
-+  url::kAboutScheme,
-+  url::kBlobScheme,
-+  url::kContentScheme,
-   url::kHttpScheme,
-   url::kHttpsScheme,
-   url::kFileScheme,
-@@ -30,7 +33,13 @@ const char* const kDefaultSavableSchemes
-   url::kFtpScheme,
-   kChromeDevToolsScheme,
-   kChromeUIScheme,
--  url::kDataScheme
-+  url::kDataScheme,
-+  url::kJavaScriptScheme,
-+  url::kMailToScheme,
-+  url::kWsScheme,
-+  url::kWssScheme,
-+  kGuestScheme,
-+  kViewSourceScheme
- };
- 
- // These lists are lazily initialized below and are leaked on shutdown to
---- content/public/common/url_utils.cc.orig
-+++ content/public/common/url_utils.cc
-@@ -26,11 +26,7 @@ bool HasWebUIScheme(const GURL& url) {
- }
- 
- bool IsSavableURL(const GURL& url) {
--  for (auto& scheme : GetSavableSchemes()) {
--    if (url.SchemeIs(scheme))
--      return true;
--  }
--  return false;
-+  return true;
- }
- 
- bool IsURLHandledByNetworkStack(const GURL& url) {
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch
deleted file mode 100644
index 6205679..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig
-+++ chrome/browser/ui/views/tabs/new_tab_button.cc
-@@ -58,10 +58,8 @@ NewTabButton::NewTabButton(TabStrip* tab
-   SetAnimateOnStateChange(true);
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
-   SetTriggerableEventFlags(GetTriggerableEventFlags() |
-                            ui::EF_MIDDLE_MOUSE_BUTTON);
--#endif
- 
-   ink_drop_container_ =
-       AddChildView(std::make_unique<views::InkDropContainerView>());
---- chrome/browser/ui/views/tabs/tab_strip.cc.orig
-+++ chrome/browser/ui/views/tabs/tab_strip.cc
-@@ -2680,8 +2680,6 @@ void TabStrip::NewTabButtonPressed(const
- 
-     const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
-     if (mouse.IsOnlyMiddleMouseButton()) {
--      if (ui::Clipboard::IsSupportedClipboardBuffer(
--              ui::ClipboardBuffer::kSelection)) {
-         ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
-         CHECK(clipboard);
-         std::u16string clipboard_text;
-@@ -2689,7 +2687,6 @@ void TabStrip::NewTabButtonPressed(const
-                             /* data_dst = */ nullptr, &clipboard_text);
-         if (!clipboard_text.empty())
-           controller_->CreateNewTabWithLocation(clipboard_text);
--      }
-       return;
-     }
-   }
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/fix-building-without-mdns-and-service-discovery.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/fix-building-without-mdns-and-service-discovery.patch
deleted file mode 100644
index 6fb35ec..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/fix-building-without-mdns-and-service-discovery.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# Fix building with enable_service_discovery=false and enable_mds=false
-
---- chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc.orig
-+++ chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc
-@@ -40,37 +40,22 @@ DnsSdDeviceLister::DnsSdDeviceLister(
- DnsSdDeviceLister::~DnsSdDeviceLister() {}
- 
- void DnsSdDeviceLister::Discover() {
--#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
--  if (!device_lister_) {
--    device_lister_ = local_discovery::ServiceDiscoveryDeviceLister::Create(
--        this, service_discovery_client_, service_type_);
--    device_lister_->Start();
--  }
--  device_lister_->DiscoverNewDevices();
--#endif
- }
- 
- void DnsSdDeviceLister::Reset() {
--  device_lister_.reset();
- }
- 
- void DnsSdDeviceLister::OnDeviceChanged(
-     const std::string& service_type,
-     bool added,
-     const ServiceDescription& service_description) {
--  DnsSdService service;
--  FillServiceInfo(service_description, &service);
--  delegate_->ServiceChanged(device_lister_->service_type(), added, service);
- }
- 
- void DnsSdDeviceLister::OnDeviceRemoved(const std::string& service_type,
-                                         const std::string& service_name) {
--  delegate_->ServiceRemoved(service_type, service_name);
- }
- 
- void DnsSdDeviceLister::OnDeviceCacheFlushed(const std::string& service_type) {
--  delegate_->ServicesFlushed(device_lister_->service_type());
--  device_lister_->DiscoverNewDevices();
- }
- 
- }  // namespace media_router
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/fix-distilled-icons.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/fix-distilled-icons.patch
deleted file mode 100644
index 80a9618..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/fix-distilled-icons.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- components/dom_distiller/core/css/distilledpage.css.orig
-+++ components/dom_distiller/core/css/distilledpage.css
-@@ -28,6 +28,11 @@
-   box-sizing: border-box;
- }
- 
-+.material-icons {
-+  font-family: Material Icons;
-+  font-style: normal !important;
-+}
-+
- /* Remove all margins and padding from certain element and add word wrap. */
- 
- blockquote,
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/keep-expired-flags.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/keep-expired-flags.patch
deleted file mode 100644
index 9f9df17..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/keep-expired-flags.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- components/flags_ui/flags_state.cc.orig
-+++ components/flags_ui/flags_state.cc
-@@ -22,6 +22,7 @@
- #include "base/values.h"
- #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
-+#include "chrome/browser/unexpire_flags.h"
- #include "components/flags_ui/feature_entry.h"
- #include "components/flags_ui/flags_storage.h"
- #include "components/flags_ui/flags_ui_switches.h"
-@@ -577,14 +578,18 @@ void FlagsState::GetFlagFeatureEntries(
-   int current_platform = GetCurrentPlatform();
- 
-   for (const FeatureEntry& entry : feature_entries_) {
-+    std::string desc = entry.visible_description;
-     if (skip_feature_entry.Run(entry))
-+      if (flags::IsFlagExpired(flags_storage, entry.internal_name))
-+        desc.insert(0, "!!! NOTE: THIS FLAG IS EXPIRED AND MAY STOP FUNCTIONING OR BE REMOVED SOON !!! ");
-+      else
-       continue;
- 
-     base::Value data(base::Value::Type::DICTIONARY);
-     data.SetStringKey("internal_name", entry.internal_name);
-     data.SetStringKey("name", base::StringPiece(entry.visible_name));
-     data.SetStringKey("description",
--                      base::StringPiece(entry.visible_description));
-+                      base::StringPiece(desc));
- 
-     base::Value supported_platforms(base::Value::Type::LIST);
-     AddOsStrings(entry.supported_platforms, &supported_platforms);
-@@ -901,6 +906,7 @@ bool FlagsState::IsSupportedFeature(cons
-     if (!entry.InternalNameMatches(name))
-       continue;
-     if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry))
-+      if (!flags::IsFlagExpired(storage, entry.internal_name))
-       continue;
-     return true;
-   }
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch
deleted file mode 100644
index 58e1587..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-## template_url_prepopulate_data.cc
-# Appends search engines to the returned list of prepopulated search engines.
-# Only add DDG if it hasn't already been included.
-#
-## util.cc
-# Only snyc the prepoulated search engines when initializing the database.
-# Prevents search engines from being overridden in future updates.
-#
---- components/search_engines/template_url_prepopulate_data.cc.orig
-+++ components/search_engines/template_url_prepopulate_data.cc
-@@ -1325,6 +1325,9 @@ std::vector<std::unique_ptr<TemplateURLD
-   std::vector<std::unique_ptr<TemplateURLData>> t_urls;
-   for (size_t i = 0; i < num_engines; ++i)
-     t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(*engines[i]));
-+  if (std::find(engines, engines + num_engines, &duckduckgo) == engines + num_engines) {
-+    t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(duckduckgo));
-+  }
-   return t_urls;
- }
- 
---- components/search_engines/util.cc.orig
-+++ components/search_engines/util.cc
-@@ -396,7 +396,7 @@ void GetSearchProvidersUsingLoadedEngine
- 
-   const int prepopulate_resource_keyword_version =
-       TemplateURLPrepopulateData::GetDataVersion(prefs);
--  if (*resource_keyword_version < prepopulate_resource_keyword_version) {
-+  if (*resource_keyword_version == 0) {
-     MergeEnginesFromPrepopulateData(service, &prepopulated_urls, template_urls,
-                                     default_search_provider,
-                                     removed_keyword_guids);
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch
deleted file mode 100644
index 55ddd53..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# Remove the "--disable-setuid-sandbox" command line flag as a bad flag
-
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig
-+++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -61,7 +61,6 @@ static const char* kBadFlags[] = {
-     // These flags disable sandbox-related security.
-     sandbox::policy::switches::kDisableGpuSandbox,
-     sandbox::policy::switches::kDisableSeccompFilterSandbox,
--    sandbox::policy::switches::kDisableSetuidSandbox,
-     sandbox::policy::switches::kNoSandbox,
- #if defined(OS_WIN)
-     sandbox::policy::switches::kAllowThirdPartyModules,
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch
deleted file mode 100644
index cbb86fd..0000000
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-# Removes in order:
-# link to Chrome store on the extensions page when empty
-# link to Chrome store in extensions page sidebar
-# 'Tabs from other devices' entry on the History page sidebar
-# the 'Learn more' link on new incognito tabs
-# Live captions entry from the settings page
-# link to Google's accessibility site from the settings page
-# link to Google's help site on the About page
-# external link for theme entry on settings page
-# Check passwords and managed passwords sections from the passwords page
-# the Google account line from the Payment methods page
-# Safety check section on the settings page
-# Google sign-in and Anonymized Data Collection sections
-# Advanced Protection Program link on the security settings page
-# the 'Learn more' link from the search engine entry on the settings page
-# Safety Check entry on the side menu on the settings page
-# the (?) learn more button on many settings pages
-# unneeded elements from the profile menu
-# the 'Learn more' link on crashed tabs
-
---- chrome/browser/resources/extensions/item_list.html.orig
-+++ chrome/browser/resources/extensions/item_list.html
-@@ -80,13 +80,6 @@
- <div id="container">
-   <managed-footnote hidden="[[filter]]"></managed-footnote>
-   <div id="content-wrapper" style="--max-columns: [[maxColumns_]];">
--    <div id="no-items" class="empty-list-message"
--        hidden$="[[!shouldShowEmptyItemsMessage_(
--            apps.length, extensions.length)]]">
--      <span on-click="onNoExtensionsTap_">
--        $i18nRaw{noExtensionsOrApps}
--      </span>
--    </div>
-     <div id="no-search-results" class="empty-list-message"
-         hidden$="[[!shouldShowEmptySearchMessage_(
-             shownAppsCount_, shownExtensionsCount_, apps, extensions)]]">
---- chrome/browser/resources/extensions/sidebar.html.orig
-+++ chrome/browser/resources/extensions/sidebar.html
-@@ -69,12 +69,3 @@
-     <paper-ripple></paper-ripple>
-   </a>
- </iron-selector>
--<div>
--  <div class="separator"></div>
--  <a class="section-item" id="more-extensions" target="_blank"
--      href="$i18n{getMoreExtensionsUrl}" on-click="onMoreExtensionsTap_">
--    <span>$i18n{openChromeWebStore}</span>
--    <div class="cr-icon icon-external"></div>
--    <paper-ripple></paper-ripple>
--  </a>
--</div>
---- chrome/browser/resources/history/side_bar.html.orig
-+++ chrome/browser/resources/history/side_bar.html
-@@ -128,13 +128,6 @@
-           $i18n{historyMenuItem}
-           <paper-ripple></paper-ripple>
-         </a>
--        <a id="syncedTabs" role="menuitem" href="/syncedTabs"
--            class="page-item cr-nav-menu-item"
--            path="syncedTabs" on-click="onItemClick_">
--          <iron-icon icon="cr:phonelink"></iron-icon>
--          $i18n{openTabsMenuItem}
--          <paper-ripple></paper-ripple>
--        </a>
-         <div class="separator"></div>
-         <a role="menuitem" id="clear-browsing-data"
-             class="cr-nav-menu-item"
---- chrome/browser/resources/ntp4/incognito_tab.html.orig
-+++ chrome/browser/resources/ntp4/incognito_tab.html
-@@ -24,8 +24,6 @@ document.querySelector('#incognitothemec
-   <h1>$i18n{incognitoTabHeading}</h1>
-   <p id="subtitle">
-     <span>$i18n{incognitoTabDescription}</span>
--    <a class="learn-more-button"
--        href="$i18n{learnMoreLink}">$i18n{learnMore}</a>
-   </p>
-   <div id="bulletpoints-wrapper">
-     <div class="bulletpoints first">$i18nRaw{incognitoTabFeatures}</div>
---- chrome/browser/resources/settings/a11y_page/a11y_page.html.orig
-+++ chrome/browser/resources/settings/a11y_page/a11y_page.html
-@@ -21,7 +21,7 @@
-               external$="[[captionSettingsOpensExternally_]]">
-           </cr-link-row>
-         </template>
--        <template is="dom-if" if="[[!captionSettingsOpensExternally_]]">
-+        <template is="dom-if" if="[[false]]">
-           <cr-link-row id="captions"
-               label="$i18n{captionsTitle}"
-               on-click="onCaptionsClick_"
-@@ -51,10 +51,6 @@
-             sub-label="$i18n{accessibleImageLabelsSubtitle}">
-         </settings-toggle-button>
- </if>
--        <cr-link-row class="hr" label="$i18n{moreFeaturesLink}"
--            on-click="onMoreFeaturesLinkClick_" sub-label="$i18n{a11yWebStore}"
--            external>
--        </cr-link-row>
-       </div>
- <if expr="not chromeos">
-       <template is="dom-if" if="[[!captionSettingsOpensExternally_]]">
---- chrome/browser/resources/settings/about_page/about_page.html.orig
-+++ chrome/browser/resources/settings/about_page/about_page.html
-@@ -131,8 +131,6 @@
-         </div>
-       </template>
- </if>
--      <cr-link-row class="hr" id="help" on-click="onHelpTap_"
--          label="$i18n{aboutGetHelpUsingChrome}" external></cr-link-row>
- <if expr="_google_chrome">
-       <cr-link-row class="hr" id="reportIssue" on-click="onReportIssueTap_"
-           hidden="[[!prefs.feedback_allowed.value]]"
---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig
-+++ chrome/browser/resources/settings/appearance_page/appearance_page.html
-@@ -22,11 +22,11 @@
-     <settings-animated-pages id="pages" section="appearance"
-         focus-config="[[focusConfig_]]">
-       <div route-path="default">
--        <div class="settings-row first" id="themeRow"
-+        <div class="cr-row first" id="themeRow"
-             hidden="[[!pageVisibility.setTheme]]">
--          <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
--              label="$i18n{themes}" sub-label="[[themeSublabel_]]"
--              on-click="openThemeUrl_" external></cr-link-row>
-+          <div class="flex cr-padded-text">
-+            <div>$i18n{themes}</div><div class="secondary">[[themeSublabel_]]</div>
-+          </div>
- <if expr="not is_posix or chromeos or lacros">
-           <template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
-             <div class="separator"></div>
---- chrome/browser/resources/settings/autofill_page/passwords_section.html.orig
-+++ chrome/browser/resources/settings/autofill_page/passwords_section.html
-@@ -107,6 +107,7 @@
-         label="$i18n{trustedVaultOptInLabel}"
-         sub-label="$i18n{trustedVaultOptInSubLabel}">
-     </cr-link-row>
-+<if expr="false">
-     <div id="checkPasswordsBannerContainer" class="cr-row"
-         hidden$="[[!shouldShowBanner_]]">
-       <picture>
-@@ -155,6 +156,7 @@
-       <!-- This div lays out the link correctly, relative to the text. -->
-       <div class="cr-padded-text">$i18nRaw{managePasswordsLabel}</div>
-     </div>
-+</if>
-     <div class="cr-row first">
-       <h2 id="savedPasswordsHeading" class="flex">
-         $i18n{savedPasswordsHeading}
---- chrome/browser/resources/settings/autofill_page/payments_section.html.orig
-+++ chrome/browser/resources/settings/autofill_page/payments_section.html
-@@ -53,11 +53,6 @@
-       </div>
-     </template>
- 
--    <div id="manageLink" class="cr-row first">
--      <!-- This span lays out the link correctly, relative to the text. -->
--      <div class="cr-padded-text">$i18nRaw{manageCreditCardsLabel}</div>
--    </div>
--
-     <div class="cr-row continuation">
-       <h2 class="flex">$i18n{creditCards}</h2>
-       <cr-button id="addCreditCard" class="header-aligned-button"
---- chrome/browser/resources/settings/basic_page/basic_page.html.orig
-+++ chrome/browser/resources/settings/basic_page/basic_page.html
-@@ -102,7 +102,7 @@
-             <settings-privacy-review-promo></settings-privacy-review-promo>
-           </settings-section>
-         </template>
--        <template is="dom-if" if="[[showPage_(pageVisibility.safetyCheck)]]"
-+        <template is="dom-if" if="[[false]]"
-             restamp>
-           <settings-section page-title="$i18n{safetyCheckSectionTitle}"
-               section="safetyCheck" nest-under-section="privacy"
---- chrome/browser/resources/settings/privacy_page/personalization_options.html.orig
-+++ chrome/browser/resources/settings/privacy_page/personalization_options.html
-@@ -8,7 +8,7 @@
-         border-top: none;
-       }
-     </style>
--<if expr="not chromeos">
-+<if expr="false">
-     <settings-toggle-button id="signinAllowedToggle"
-         class="hr"
-         hidden="[[!signinAvailable_]]"
-@@ -51,12 +51,6 @@
-     </settings-toggle-button>
- </if><!-- not chromeos -->
- </if><!-- _google_chrome -->
--    <settings-toggle-button id="urlCollectionToggle"
--        class="hr"
--        pref="{{prefs.url_keyed_anonymized_data_collection.enabled}}"
--        label="$i18n{urlKeyedAnonymizedDataCollection}"
--        sub-label="$i18n{urlKeyedAnonymizedDataCollectionDesc}">
--    </settings-toggle-button>
- <if expr="_google_chrome">
-     <settings-toggle-button id="spellCheckControl"
-         class="hr"
---- chrome/browser/resources/settings/privacy_page/security_page.html.orig
-+++ chrome/browser/resources/settings/privacy_page/security_page.html
-@@ -96,10 +96,3 @@
-         sub-label="$i18n{manageCertificatesDescription}"
-         on-click="onManageCertificatesClick_"></cr-link-row>
- </if>
--    <cr-link-row id="advanced-protection-program-link"
--        class="hr"
--        label="$i18n{advancedProtectionProgramTitle}"
--        sub-label="$i18n{advancedProtectionProgramDesc}"
--        on-click="onAdvancedProtectionProgramLinkClick_"
--        external>
--    </cr-link-row>
---- chrome/browser/resources/settings/search_page/search_page.html.orig
-+++ chrome/browser/resources/settings/search_page/search_page.html
-@@ -12,10 +12,6 @@
-     <div class="cr-row first">
-       <div id="searchExplanation" class="flex cr-padded-text">
-         $i18n{searchExplanation}
--        <a href="$i18n{searchExplanationLearnMoreURL}"
--            target="_blank">
--          $i18n{learnMore}
--        </a>
-       </div>
-       <template is="dom-if" if="[[isDefaultSearchControlledByPolicy_(
-           prefs.default_search_provider_data.template_url_data)]]">
---- chrome/browser/resources/settings/settings_menu/settings_menu.html.orig
-+++ chrome/browser/resources/settings/settings_menu/settings_menu.html
-@@ -111,7 +111,7 @@
-             $i18n{autofillPageTitle}
-             <paper-ripple></paper-ripple>
-           </a>
--          <template is="dom-if" if="[[!enableLandingPageRedesign_]]">
-+          <template is="dom-if" if="[[false]]">
-             <a role="menuitem" href="/safetyCheck"
-                 hidden="[[!pageVisibility.safetyCheck]]"
-                 id="safetyCheck"
---- chrome/browser/resources/settings/settings_page/settings_subpage.html.orig
-+++ chrome/browser/resources/settings/settings_page/settings_subpage.html
-@@ -72,7 +72,7 @@
-       </template>
-       <h1 class="cr-title-text">[[pageTitle]]</h1>
-       <slot name="subpage-title-extra"></slot>
--      <template is="dom-if" if="[[learnMoreUrl]]">
-+      <template is="dom-if" if="[[false]]">
-         <cr-icon-button iron-icon="cr:help-outline" dir="ltr"
-             aria-label="$i18n{learnMore}" on-click="onHelpClick_">
-         </cr-icon-button>
---- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig
-+++ chrome/browser/ui/views/profiles/profile_menu_view.cc
-@@ -176,6 +176,7 @@ void ProfileMenuView::BuildMenu() {
- }
- 
- gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
-+  return gfx::ImageSkia();
-   Profile* profile = browser()->profile();
-   if (profile->IsOffTheRecord() || profile->IsGuestSession())
-     return gfx::ImageSkia();
-@@ -450,8 +451,7 @@ void ProfileMenuView::BuildIdentity() {
-         menu_subtitle_);
-   } else {
-     menu_title_ = std::u16string();
--    menu_subtitle_ =
--        l10n_util::GetStringUTF16(IDS_PROFILES_LOCAL_PROFILE_STATE);
-+    menu_subtitle_ = std::u16string();
-     SetProfileIdentityInfo(
-         profile_name, background_color, edit_button_params,
-         ui::ImageModel::FromImage(
---- chrome/browser/ui/views/sad_tab_view.cc.orig
-+++ chrome/browser/ui/views/sad_tab_view.cc
-@@ -556,15 +556,9 @@ SadTabView::SadTabView(content::WebConte
-       CreateErrorCodeLabel(GetErrorCodeFormatString(), GetCrashedErrorCode()),
-       2, 1.0, views::GridLayout::LEADING, views::GridLayout::LEADING);
- 
--  auto help_link = std::make_unique<views::Link>(
--      l10n_util::GetStringUTF16(GetHelpLinkTitle()));
--  help_link->SetCallback(base::BindRepeating(
--      &SadTab::PerformAction, base::Unretained(this), Action::HELP_LINK));
-   layout->StartRowWithPadding(views::GridLayout::kFixedSize, column_set_id,
-                               views::GridLayout::kFixedSize,
-                               unrelated_vertical_spacing_large);
--  layout->AddView(std::move(help_link), 1.0, 1.0, views::GridLayout::LEADING,
--                  views::GridLayout::CENTER);
-   auto action_button = std::make_unique<views::MdTextButton>(
-       base::BindRepeating(&SadTabView::PerformAction, base::Unretained(this),
-                           Action::BUTTON),