63 files changed, 799 insertions, 865 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
index 2d6821f..59fbb6d 100644
--- 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
@@ -7,9 +7,9 @@
 #
 # 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") {
+--- a/chrome/browser/BUILD.gn
++++ b/chrome/browser/BUILD.gn
+@@ -2350,6 +2350,7 @@ static_library("browser") {
      "//third_party/libyuv",
      "//third_party/metrics_proto",
      "//third_party/re2",
@@ -17,9 +17,9 @@
      "//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 @@
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -150,6 +150,7 @@
  #include "components/translate/core/browser/translate_ranker_impl.h"
  #include "components/translate/core/common/translate_util.h"
  #include "components/ui_devtools/switches.h"
@@ -27,8 +27,8 @@
  #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
+--- a/chrome/browser/bromite_flag_entries.h
++++ b/chrome/browser/bromite_flag_entries.h
 @@ -4,4 +4,12 @@
  
  #ifndef CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
@@ -42,9 +42,9 @@
 +     "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") {
+--- a/content/browser/BUILD.gn
++++ b/content/browser/BUILD.gn
+@@ -226,6 +226,7 @@ source_set("browser") {
      "//third_party/libyuv",
      "//third_party/re2",
      "//third_party/sqlite",
@@ -52,9 +52,9 @@
      "//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 @@
+--- a/content/browser/renderer_host/render_process_host_impl.cc
++++ b/content/browser/renderer_host/render_process_host_impl.cc
+@@ -74,6 +74,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"
@@ -62,7 +62,7 @@
  #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
+@@ -3363,6 +3364,8 @@ void RenderProcessHostImpl::PropagateBro
      switches::kEnableWebGLDraftExtensions,
      switches::kEnableWebGLImageChromium,
      switches::kFileUrlPathAlias,
@@ -71,8 +71,8 @@
      switches::kForceDeviceScaleFactor,
      switches::kForceDisplayColorProfile,
      switches::kForceGpuMemAvailableMb,
---- content/child/BUILD.gn.orig
-+++ content/child/BUILD.gn
+--- a/content/child/BUILD.gn
++++ b/content/child/BUILD.gn
 @@ -103,6 +103,7 @@ target(link_target_type, "child") {
      "//third_party/blink/public/common",
      "//third_party/blink/public/strings",
@@ -81,9 +81,9 @@
      "//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 @@
+--- a/content/child/runtime_features.cc
++++ b/content/child/runtime_features.cc
+@@ -32,6 +32,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"
@@ -91,10 +91,10 @@
  #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},
+@@ -486,6 +487,10 @@ void SetRuntimeFeaturesFromCommandLine(c
        {wrf::ForceOverlayFullscreenVideo, switches::kForceOverlayFullscreenVideo,
         true},
+       {wrf::EnableDirectSockets, switches::kRestrictedApiOrigins, false},
 +      {wrf::EnableFingerprintingClientRectsNoise,
 +       switches::kFingerprintingClientRectsNoise, true},
 +      {wrf::EnableFingerprintingCanvasMeasureTextNoise,
@@ -102,9 +102,9 @@
    };
    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 {
+--- a/third_party/blink/public/platform/web_runtime_features.h
++++ b/third_party/blink/public/platform/web_runtime_features.h
+@@ -212,6 +212,8 @@ class WebRuntimeFeatures {
    BLINK_PLATFORM_EXPORT static void EnableMediaControlsExpandGesture(bool);
    BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
    BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
@@ -113,8 +113,8 @@
    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
+--- a/third_party/blink/renderer/core/dom/document.cc
++++ b/third_party/blink/renderer/core/dom/document.cc
 @@ -42,6 +42,7 @@
  #include "base/containers/contains.h"
  #include "base/debug/dump_without_crashing.h"
@@ -123,7 +123,7 @@
  #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
+@@ -871,6 +872,14 @@ Range* Document::CreateRangeAdjustedToTr
                                       Position::BeforeNode(*shadow_host));
  }
  
@@ -138,7 +138,7 @@
  SelectorQueryCache& Document::GetSelectorQueryCache() {
    if (!selector_query_cache_)
      selector_query_cache_ = std::make_unique<SelectorQueryCache>();
-@@ -2145,6 +2154,15 @@ void Document::UpdateStyleAndLayoutTreeF
+@@ -2166,6 +2175,15 @@ void Document::UpdateStyleAndLayoutTreeF
  #if DCHECK_IS_ON()
    AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */);
  #endif
@@ -154,9 +154,9 @@
  }
  
  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
+--- a/third_party/blink/renderer/core/dom/document.h
++++ b/third_party/blink/renderer/core/dom/document.h
+@@ -478,6 +478,10 @@ class CORE_EXPORT Document : public Cont
      has_xml_declaration_ = has_xml_declaration ? 1 : 0;
    }
  
@@ -167,7 +167,7 @@
    AtomicString visibilityState() const;
    bool IsPageVisible() const;
    bool hidden() const;
-@@ -2078,6 +2082,9 @@ class CORE_EXPORT Document : public Cont
+@@ -2137,6 +2141,9 @@ class CORE_EXPORT Document : public Cont
  
    base::ElapsedTimer start_time_;
  
@@ -177,38 +177,38 @@
    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() {
+--- a/third_party/blink/renderer/core/dom/element.cc
++++ b/third_party/blink/renderer/core/dom/element.cc
+@@ -2090,6 +2090,11 @@ DOMRectList* Element::getClientRects() {
    DCHECK(element_layout_object);
-   GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
-       quads, *element_layout_object);
+   GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
+                                                     *element_layout_object);
 +  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
-+    for (FloatQuad& quad : quads) {
++    for (gfx::QuadF& quad : quads) {
 +      quad.Scale(GetDocument().GetNoiseFactorX(), GetDocument().GetNoiseFactorY());
 +    }
 +  }
    return MakeGarbageCollected<DOMRectList>(quads);
  }
  
-@@ -2131,6 +2136,9 @@ FloatRect Element::GetBoundingClientRect
+@@ -2107,6 +2112,9 @@ gfx::RectF Element::GetBoundingClientRec
    DCHECK(element_layout_object);
-   GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
-                                                         *element_layout_object);
+   GetDocument().AdjustRectForScrollAndAbsoluteZoom(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
+--- a/third_party/blink/renderer/core/dom/range.cc
++++ b/third_party/blink/renderer/core/dom/range.cc
 @@ -1598,11 +1598,21 @@ DOMRectList* Range::getClientRects() con
-   Vector<FloatQuad> quads;
+   Vector<gfx::QuadF> quads;
    GetBorderAndTextQuads(quads);
  
 +  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
-+    for (FloatQuad& quad : quads) {
++    for (gfx::QuadF& quad : quads) {
 +      quad.Scale(owner_document_->GetNoiseFactorX(), owner_document_->GetNoiseFactorY());
 +    }
 +  }
@@ -217,17 +217,17 @@
  }
  
  DOMRect* Range::getBoundingClientRect() const {
--  return DOMRect::FromFloatRect(BoundingRect());
+-  return DOMRect::FromRectF(BoundingRect());
 +  auto rect = BoundingRect();
 +  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
 +    rect.Scale(owner_document_->GetNoiseFactorX(), owner_document_->GetNoiseFactorY());
 +  }
-+  return DOMRect::FromFloatRect(rect);
++  return DOMRect::FromRectF(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
+--- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
++++ b/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);
  }
@@ -253,8 +253,8 @@
  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
+--- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
++++ b/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;
@@ -264,9 +264,9 @@
   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
+--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
++++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+@@ -923,9 +923,15 @@ TextMetrics* CanvasRenderingContext2D::m
    TextDirection direction =
        ToTextDirection(GetState().GetDirection(), canvas());
  
@@ -283,19 +283,19 @@
  }
  
  void CanvasRenderingContext2D::fillFormattedText(
---- third_party/blink/renderer/platform/BUILD.gn.orig
-+++ third_party/blink/renderer/platform/BUILD.gn
-@@ -1686,6 +1686,7 @@ component("platform") {
+--- a/third_party/blink/renderer/platform/BUILD.gn
++++ b/third_party/blink/renderer/platform/BUILD.gn
+@@ -1665,6 +1665,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
+     "//components/webrtc:net_address_utils",
+--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
++++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+@@ -659,4 +659,12 @@ void WebRuntimeFeatures::EnableCLSScroll
    RuntimeEnabledFeatures::SetCLSScrollAnchoringEnabled(enable);
  }
  
@@ -308,10 +308,10 @@
 +}
 +
  }  // 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",
+--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
++++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
+@@ -1118,6 +1118,12 @@
+       name: "Focusgroup",
      },
      {
 +      name: "FingerprintingClientRectsNoise",
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
index 6ebc7a1..e7b6dce 100644
--- 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
@@ -21,8 +21,8 @@ approach to change color components.
  .../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
+--- a/chrome/browser/bromite_flag_entries.h
++++ b/chrome/browser/bromite_flag_entries.h
 @@ -16,4 +16,8 @@
       flag_descriptions::kMaxConnectionsPerHostName,
       flag_descriptions::kMaxConnectionsPerHostDescription,
@@ -32,9 +32,9 @@ approach to change color components.
 +     "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
+--- a/content/browser/renderer_host/render_process_host_impl.cc
++++ b/content/browser/renderer_host/render_process_host_impl.cc
+@@ -3366,6 +3366,7 @@ void RenderProcessHostImpl::PropagateBro
      switches::kFileUrlPathAlias,
      switches::kFingerprintingClientRectsNoise,
      switches::kFingerprintingCanvasMeasureTextNoise,
@@ -42,9 +42,9 @@ approach to change color components.
      switches::kForceDeviceScaleFactor,
      switches::kForceDisplayColorProfile,
      switches::kForceGpuMemAvailableMb,
---- content/child/runtime_features.cc.orig
-+++ content/child/runtime_features.cc
-@@ -471,6 +471,8 @@ void SetRuntimeFeaturesFromCommandLine(c
+--- a/content/child/runtime_features.cc
++++ b/content/child/runtime_features.cc
+@@ -491,6 +491,8 @@ void SetRuntimeFeaturesFromCommandLine(c
         switches::kFingerprintingClientRectsNoise, true},
        {wrf::EnableFingerprintingCanvasMeasureTextNoise,
         switches::kFingerprintingCanvasMeasureTextNoise, true},
@@ -53,9 +53,9 @@ approach to change color components.
    };
    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 {
+--- a/third_party/blink/public/platform/web_runtime_features.h
++++ b/third_party/blink/public/platform/web_runtime_features.h
+@@ -214,6 +214,7 @@ class WebRuntimeFeatures {
    BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
    BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
    BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
@@ -63,17 +63,17 @@ approach to change color components.
    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 @@
+--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
++++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+@@ -29,6 +29,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
+ #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
+@@ -2049,6 +2050,9 @@ ImageData* BaseRenderingContext2D::getIm
            snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
        DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
      }
@@ -83,9 +83,9 @@ approach to change color components.
    }
  
    return image_data;
---- third_party/blink/renderer/platform/BUILD.gn.orig
-+++ third_party/blink/renderer/platform/BUILD.gn
-@@ -1645,7 +1645,9 @@ component("platform") {
+--- a/third_party/blink/renderer/platform/BUILD.gn
++++ b/third_party/blink/renderer/platform/BUILD.gn
+@@ -1623,7 +1623,9 @@ component("platform") {
      "//third_party/blink/renderer:non_test_config",
    ]
  
@@ -96,9 +96,9 @@ approach to change color components.
  
    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
+--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
++++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+@@ -667,4 +667,8 @@ void WebRuntimeFeatures::EnableFingerpri
    RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
  }
  
@@ -107,8 +107,8 @@ approach to change color components.
 +}
 +
  }  // namespace blink
---- third_party/blink/renderer/platform/graphics/image_data_buffer.cc.orig
-+++ third_party/blink/renderer/platform/graphics/image_data_buffer.cc
+--- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
++++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
 @@ -36,6 +36,8 @@
  
  #include "base/compiler_specific.h"
@@ -130,8 +130,8 @@ approach to change color components.
    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
+--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
++++ b/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"
@@ -151,10 +151,10 @@ approach to change color components.
  #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 "ui/gfx/geometry/skia_conversions.h"
  #include "v8/include/v8.h"
  
- namespace blink {
-@@ -80,4 +84,154 @@ void StaticBitmapImage::DrawHelper(cc::P
+@@ -79,4 +83,154 @@ void StaticBitmapImage::DrawHelper(cc::P
        WebCoreClampingModeToSkiaRectConstraint(draw_options.clamping_mode));
  }
  
@@ -309,8 +309,8 @@ approach to change color components.
 +#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
+--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
++++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
 @@ -36,6 +36,8 @@ class PLATFORM_EXPORT StaticBitmapImage
  
    StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {}
@@ -320,9 +320,9 @@ approach to change color components.
    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 @@
+--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
++++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
+@@ -1124,6 +1124,9 @@
        name: "FingerprintingCanvasMeasureTextNoise",
      },
      {
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
index 65b1887..16055fe 100644
--- 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
@@ -15,9 +15,9 @@ with limited CPU/memory resources and it is disabled by default.
  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") {
+--- a/chrome/browser/BUILD.gn
++++ b/chrome/browser/BUILD.gn
+@@ -2102,6 +2102,7 @@ static_library("browser") {
      "//components/net_log",
      "//components/network_hints/common:mojo_bindings",
      "//components/network_session_configurator/browser",
@@ -25,8 +25,8 @@ with limited CPU/memory resources and it is disabled by default.
      "//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
+--- a/chrome/browser/bromite_flag_choices.h
++++ b/chrome/browser/bromite_flag_choices.h
 @@ -4,4 +4,8 @@
  
  #ifndef CHROME_BROWSER_BROMITE_FLAG_CHOICES_H_
@@ -36,8 +36,8 @@ with limited CPU/memory resources and it is disabled by default.
 +    {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
+--- a/chrome/browser/bromite_flag_entries.h
++++ b/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.",
@@ -47,24 +47,22 @@ with limited CPU/memory resources and it is disabled by default.
 +     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 @@
+--- a/chrome/browser/browser_process_impl.cc
++++ b/chrome/browser/browser_process_impl.cc
+@@ -19,10 +19,12 @@
  #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/single_thread_task_runner.h"
  #include "base/task/task_traits.h"
- #include "base/task/thread_pool.h"
-@@ -103,6 +105,7 @@
+@@ -102,6 +104,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"
@@ -72,7 +70,7 @@ with limited CPU/memory resources and it is disabled by default.
  #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 @@
+@@ -134,6 +137,7 @@
  #include "media/media_buildflags.h"
  #include "mojo/public/cpp/bindings/pending_receiver.h"
  #include "net/log/net_log.h"
@@ -80,9 +78,9 @@ with limited CPU/memory resources and it is disabled by default.
  #include "ppapi/buildflags/buildflags.h"
  #include "printing/buildflags/buildflags.h"
  #include "services/network/public/cpp/features.h"
-@@ -345,6 +349,18 @@ void BrowserProcessImpl::Init() {
+@@ -343,6 +347,18 @@ void BrowserProcessImpl::Init() {
+   pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
                               base::BindRepeating(&ApplyMetricsReportingPolicy));
- #endif
  
 +  int max_connections_per_host = 0;
 +  auto switch_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
@@ -99,11 +97,11 @@ with limited CPU/memory resources and it is disabled by default.
    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.";
+--- a/chrome/browser/flag_descriptions.cc
++++ b/chrome/browser/flag_descriptions.cc
+@@ -1630,6 +1630,10 @@ const char kLogJsConsoleMessagesDescript
+     "Enable logging JS console messages in system logs, please note that they "
+     "may contain PII.";
  
 +const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
 +const char kMaxConnectionsPerHostDescription[] =
@@ -112,11 +110,11 @@ with limited CPU/memory resources and it is disabled by default.
  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[];
+--- a/chrome/browser/flag_descriptions.h
++++ b/chrome/browser/flag_descriptions.h
+@@ -931,6 +931,9 @@ extern const char kLensCameraAssistedSea
+ extern const char kLogJsConsoleMessagesName[];
+ extern const char kLogJsConsoleMessagesDescription[];
  
 +extern const char kMaxConnectionsPerHostName[];
 +extern const char kMaxConnectionsPerHostDescription[];
@@ -124,8 +122,8 @@ with limited CPU/memory resources and it is disabled by default.
  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
+--- a/components/network_session_configurator/common/network_features.cc
++++ b/components/network_session_configurator/common/network_features.cc
 @@ -8,4 +8,7 @@
  
  namespace features {
@@ -134,8 +132,8 @@ with limited CPU/memory resources and it is disabled by default.
 +                 kMaxConnectionsPerHostChoice15[] = "15";
 +
  }  // namespace features
---- components/network_session_configurator/common/network_features.h.orig
-+++ components/network_session_configurator/common/network_features.h
+--- a/components/network_session_configurator/common/network_features.h
++++ b/components/network_session_configurator/common/network_features.h
 @@ -10,6 +10,10 @@
  
  namespace features {
@@ -147,8 +145,8 @@ with limited CPU/memory resources and it is disabled by default.
  }  // 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
+--- a/components/network_session_configurator/common/network_switch_list.h
++++ b/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")
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
index 1c9d44b..5ed977e 100644
--- a/www/chromium-uc/patches/extra/debian/disable/google-api-warning.patch
+++ b/www/chromium-uc/patches/extra/debian/disable/google-api-warning.patch
@@ -1,9 +1,9 @@
 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
+--- a/chrome/browser/ui/startup/infobar_utils.cc
++++ b/chrome/browser/ui/startup/infobar_utils.cc
+@@ -113,9 +113,6 @@ void AddInfoBarsIfNecessary(Browser* bro
      infobars::ContentInfoBarManager* infobar_manager =
          infobars::ContentInfoBarManager::FromWebContents(web_contents);
  
diff --git a/www/chromium-uc/patches/extra/debian/disable/welcome-page.patch b/www/chromium-uc/patches/extra/debian/disable/welcome-page.patch
index 873aeae..322bd38 100644
--- a/www/chromium-uc/patches/extra/debian/disable/welcome-page.patch
+++ b/www/chromium-uc/patches/extra/debian/disable/welcome-page.patch
@@ -2,13 +2,13 @@ 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
+--- a/chrome/browser/profiles/profile_manager.cc
++++ b/chrome/browser/profiles/profile_manager.cc
+@@ -1379,7 +1379,7 @@ void ProfileManager::InitProfileUserPref
      profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
                                     supervised_user_id);
    }
--#if !defined(OS_ANDROID)
+-#if !BUILDFLAG(IS_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
diff --git a/www/chromium-uc/patches/extra/debian/fixes/connection-message.patch b/www/chromium-uc/patches/extra/debian/fixes/connection-message.patch
index d9aaa94..a4e9922 100644
--- a/www/chromium-uc/patches/extra/debian/fixes/connection-message.patch
+++ b/www/chromium-uc/patches/extra/debian/fixes/connection-message.patch
@@ -2,8 +2,8 @@ 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
+--- a/components/error_page_strings.grdp
++++ b/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.">
diff --git a/www/chromium-uc/patches/extra/debian/gn/parallel.patch b/www/chromium-uc/patches/extra/debian/gn/parallel.patch
index ac0a2b0..77e0110 100644
--- a/www/chromium-uc/patches/extra/debian/gn/parallel.patch
+++ b/www/chromium-uc/patches/extra/debian/gn/parallel.patch
@@ -1,8 +1,8 @@
 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
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/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)')
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
index d62ef29..d5ef7dc 100644
--- 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
@@ -1,6 +1,6 @@
 
---- chrome/browser/background/background_mode_manager.cc.orig
-+++ chrome/browser/background/background_mode_manager.cc
+--- a/chrome/browser/background/background_mode_manager.cc
++++ b/chrome/browser/background/background_mode_manager.cc
 @@ -376,7 +376,7 @@ void BackgroundModeManager::RegisterPref
    registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
    registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
@@ -10,9 +10,9 @@
  }
  
  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
+--- a/chrome/browser/chrome_content_browser_client.cc
++++ b/chrome/browser/chrome_content_browser_client.cc
+@@ -1264,7 +1264,7 @@ void ChromeContentBrowserClient::Registe
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -21,31 +21,9 @@
    // 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
+--- a/chrome/browser/net/profile_network_context_service.cc
++++ b/chrome/browser/net/profile_network_context_service.cc
+@@ -337,7 +337,7 @@ void ProfileNetworkContextService::Updat
  void ProfileNetworkContextService::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
@@ -54,19 +32,30 @@
        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
+--- a/chrome/browser/prefetch/prefetch_prefs.h
++++ b/chrome/browser/prefetch/prefetch_prefs.h
+@@ -22,7 +22,7 @@ enum class NetworkPredictionOptions {
+   kWifiOnlyDeprecated = 1,
+   kDisabled = 2,
+   kExtended = 3,
+-  kDefault = kWifiOnlyDeprecated,
++  kDefault = kDisabled,
+ };
+ 
+ // Enum representing possible values of the Preload Pages opt-in state.  Since
+--- a/chrome/browser/profiles/profile.cc
++++ b/chrome/browser/profiles/profile.cc
+@@ -275,7 +275,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)
+ #if BUILDFLAG(IS_ANDROID)
    registry->RegisterStringPref(
---- chrome/browser/resources/settings/reset_page/reset_profile_dialog.html.orig
-+++ chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
+--- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
++++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
 @@ -36,7 +36,7 @@
          </cr-button>
        </div>
@@ -76,9 +65,9 @@
            $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
+--- a/chrome/browser/signin/account_consistency_mode_manager.cc
++++ b/chrome/browser/signin/account_consistency_mode_manager.cc
+@@ -110,7 +110,7 @@ AccountConsistencyModeManager::~AccountC
  // static
  void AccountConsistencyModeManager::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
@@ -87,8 +76,8 @@
  }
  
  // static
---- chrome/browser/ui/browser_ui_prefs.cc.orig
-+++ chrome/browser/ui/browser_ui_prefs.cc
+--- a/chrome/browser/ui/browser_ui_prefs.cc
++++ b/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);
@@ -103,19 +92,8 @@
    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
+--- a/components/autofill/core/common/autofill_prefs.cc
++++ b/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.
@@ -138,9 +116,9 @@
        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:
+--- a/components/bookmarks/browser/bookmark_utils.cc
++++ b/components/bookmarks/browser/bookmark_utils.cc
+@@ -438,7 +438,7 @@ bool DoesBookmarkContainWords(const std:
  void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kShowBookmarkBar,
@@ -149,8 +127,8 @@
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
    registry->RegisterBooleanPref(prefs::kEditBookmarksEnabled, true);
    registry->RegisterBooleanPref(
---- components/bookmarks/browser/features.cc.orig
-+++ components/bookmarks/browser/features.cc
+--- a/components/bookmarks/browser/features.cc
++++ b/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
@@ -160,8 +138,8 @@
  
  }  // namespace features
  }  // namespace bookmarks
---- components/content_settings/core/browser/cookie_settings.cc.orig
-+++ components/content_settings/core/browser/cookie_settings.cc
+--- a/components/content_settings/core/browser/cookie_settings.cc
++++ b/components/content_settings/core/browser/cookie_settings.cc
 @@ -63,7 +63,7 @@ void CookieSettings::RegisterProfilePref
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterIntegerPref(
@@ -171,8 +149,8 @@
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
  }
  
---- components/password_manager/core/browser/password_manager.cc.orig
-+++ components/password_manager/core/browser/password_manager.cc
+--- a/components/password_manager/core/browser/password_manager.cc
++++ b/components/password_manager/core/browser/password_manager.cc
 @@ -204,10 +204,10 @@ bool HasMutedCredentials(base::span<cons
  void PasswordManager::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
@@ -186,8 +164,8 @@
        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
+--- a/components/payments/core/payment_prefs.cc
++++ b/components/payments/core/payment_prefs.cc
 @@ -16,7 +16,7 @@ const char kCanMakePaymentEnabled[] = "p
  void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(kPaymentsFirstTransactionCompleted, false);
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
index 9d21b6f..288c6f5 100644
--- 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
@@ -1,6 +1,6 @@
---- chrome/browser/search/search.cc.orig
-+++ chrome/browser/search/search.cc
-@@ -182,26 +182,7 @@ struct NewTabURLDetails {
+--- a/chrome/browser/search/search.cc
++++ b/chrome/browser/search/search.cc
+@@ -184,26 +184,7 @@ struct NewTabURLDetails {
                               : chrome::kChromeUINewTabPageThirdPartyURL);
  #endif
  
@@ -28,8 +28,8 @@
    }
  
    const GURL url;
---- components/ntp_snippets/features.cc.orig
-+++ components/ntp_snippets/features.cc
+--- a/components/ntp_snippets/features.cc
++++ b/components/ntp_snippets/features.cc
 @@ -39,7 +39,7 @@ const base::Feature* const kAllFeatures[
      &kOptionalImagesEnabledFeature};
  
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
index 0b14cd8..c5a74c7 100644
--- 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
@@ -1,5 +1,5 @@
---- chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc.orig
-+++ chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
+--- a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
++++ b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
 @@ -17,9 +17,6 @@
  // static
  void GoogleApiKeysInfoBarDelegate::Create(
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
index ff72a53..6ee4d73 100644
--- 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
@@ -1,6 +1,6 @@
---- sandbox/linux/BUILD.gn.orig
-+++ sandbox/linux/BUILD.gn
-@@ -327,6 +327,12 @@ if (is_linux || is_chromeos) {
+--- a/sandbox/linux/BUILD.gn
++++ b/sandbox/linux/BUILD.gn
+@@ -296,6 +296,12 @@ if (is_linux || is_chromeos) {
        # These files have a suspicious comparison.
        # TODO fix this and re-enable this warning.
        "-Wno-sign-compare",
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
index 4790f65..dd03502 100644
--- 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
@@ -1,6 +1,6 @@
---- 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) {
+--- a/chrome/browser/ui/startup/startup_tab_provider.cc
++++ b/chrome/browser/ui/startup/startup_tab_provider.cc
+@@ -108,7 +108,7 @@ bool ValidateUrl(const GURL& url) {
  
  StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const {
  // Chrome OS has its own welcome flow provided by OOBE.
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
index ded3df9..e69d4da 100644
--- 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
@@ -1,5 +1,5 @@
---- services/device/battery/battery_status_service.cc.orig
-+++ services/device/battery/battery_status_service.cc
+--- a/services/device/battery/battery_status_service.cc
++++ b/services/device/battery/battery_status_service.cc
 @@ -22,10 +22,7 @@ BatteryStatusService::BatteryStatusServi
        update_callback_(
            base::BindRepeating(&BatteryStatusService::NotifyConsumers,
@@ -82,9 +82,9 @@
    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 {
+--- a/services/device/battery/battery_status_service.h
++++ b/services/device/battery/battery_status_service.h
+@@ -59,15 +59,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);
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
index 8f794fe..5f6dedb 100644
--- a/www/chromium-uc/patches/extra/iridium-browser/Remove-EV-certificates.patch
+++ b/www/chromium-uc/patches/extra/iridium-browser/Remove-EV-certificates.patch
@@ -7,16 +7,15 @@ 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 {
+--- a/net/cert/ev_root_ca_metadata.cc
++++ b/net/cert/ev_root_ca_metadata.cc
+@@ -41,7 +41,17 @@ struct EVMetadata {
+   const base::StringPiece policy_oids[kMaxOIDsPerCA];
+ };
  
- // These certificates may be found in net/data/ssl/ev_roots.
- static const EVMetadata kEvRootCaMetadata[] = {
+-#include "net/data/ssl/ev_roots/chrome-ev-root-store-inc.cc"
++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)
@@ -25,18 +24,7 @@ Instead, let them appear just like regular ones.
 +      {
 +        "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)
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
index 0072e8f..2f3b4f7 100644
--- 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
@@ -3,18 +3,14 @@ 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
+--- a/chrome/browser/chrome_browser_main.cc
++++ b/chrome/browser/chrome_browser_main.cc
+@@ -1617,8 +1617,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);
+-    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_,
+     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
index a6eab74..e66b0d6 100644
--- 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
@@ -9,8 +9,8 @@ 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
+--- a/third_party/blink/common/mime_util/mime_util.cc
++++ b/third_party/blink/common/mime_util/mime_util.cc
 @@ -83,6 +83,7 @@ static const char* const kUnsupportedTex
      "text/x-csv",
      "text/x-vcf",
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
index 394a6da..fe39bb4 100644
--- 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
@@ -10,9 +10,9 @@ 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(
+--- a/net/cert/x509_util.cc
++++ b/net/cert/x509_util.cc
+@@ -243,7 +243,7 @@ bool GetTLSServerEndPointChannelBinding(
  }
  
  // RSA keys created by CreateKeyAndSelfSignedCert will be of this length.
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
index beb8b0b..b1aa987 100644
--- 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
@@ -27,9 +27,9 @@ 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
+--- a/chrome/browser/download/download_prefs.cc
++++ b/chrome/browser/download/download_prefs.cc
+@@ -262,7 +262,7 @@ void DownloadPrefs::RegisterProfilePrefs
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kPromptForDownload,
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
index 01696b7..41e42b8 100644
--- 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
@@ -8,11 +8,11 @@ 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!
+--- a/components/content_settings/core/browser/content_settings_registry.cc
++++ b/components/content_settings/core/browser/content_settings_registry.cc
+@@ -131,7 +131,7 @@ void ContentSettingsRegistry::Init() {
+   // PrefProvider::DiscardOrMigrateObsoletePreferences() and
+   // DefaultProvider::DiscardOrMigrateObsoletePreferences() accordingly.
  
 -  Register(ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_ALLOW,
 +  Register(ContentSettingsType::COOKIES, "cookies", CONTENT_SETTING_SESSION_ONLY,
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
index a6be904..1394a10 100644
--- 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
@@ -14,8 +14,8 @@ 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
+--- a/chrome/browser/app_controller_mac.mm
++++ b/chrome/browser/app_controller_mac.mm
 @@ -866,7 +866,7 @@ static base::mac::ScopedObjCClassSwizzle
    CFStringRef checkInterval = CFSTR("checkInterval");
    CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, 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
index 167eaec..c9ef633 100644
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-components-ungoogled.patch
+++ b/www/chromium-uc/patches/extra/ungoogled-chromium/add-components-ungoogled.patch
@@ -1,7 +1,7 @@
 # Add ungoogled-chromium-specific code to components/ungoogled/
 
 --- /dev/null
-+++ components/ungoogled/BUILD.gn
++++ b/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
@@ -18,7 +18,7 @@
 +  deps = [ "//base" ]
 +}
 --- /dev/null
-+++ components/ungoogled/ungoogled_switches.cc
++++ b/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
@@ -42,7 +42,7 @@
 +
 +}  // namespace switches
 --- /dev/null
-+++ components/ungoogled/ungoogled_switches.h
++++ b/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
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
index 6df493e..0df57e0 100644
--- 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
@@ -5,8 +5,8 @@ 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
+--- a/components/version_ui_strings.grdp
++++ b/components/version_ui_strings.grdp
 @@ -4,10 +4,10 @@
      About Version
    </message>
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
index 0d622e8..169ac68 100644
--- 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
@@ -1,5 +1,5 @@
---- chrome/browser/ui/bookmarks/bookmark_tab_helper.cc.orig
-+++ chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
+--- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
++++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
 @@ -4,6 +4,7 @@
  
  #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
@@ -22,8 +22,8 @@
  }
  
  void BookmarkTabHelper::AddObserver(BookmarkTabHelperObserver* observer) {
---- chrome/browser/ungoogled_flag_choices.h.orig
-+++ chrome/browser/ungoogled_flag_choices.h
+--- a/chrome/browser/ungoogled_flag_choices.h
++++ b/chrome/browser/ungoogled_flag_choices.h
 @@ -39,4 +39,10 @@ const FeatureEntry::Choice kPDFPluginNam
      {"Google Chrome", switches::kPDFPluginName, "chrome"},
      {"Microsoft Edge", switches::kPDFPluginName, "edge"},
@@ -35,9 +35,9 @@
 +     "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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -40,4 +40,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)},
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
index 56dc7e2..81fd375 100644
--- 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
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser.cc.orig
-+++ chrome/browser/ui/browser.cc
-@@ -140,6 +140,8 @@
+--- a/chrome/browser/ui/browser.cc
++++ b/chrome/browser/ui/browser.cc
+@@ -139,6 +139,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"
@@ -9,7 +9,7 @@
  #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
+@@ -468,6 +470,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),
@@ -17,7 +17,7 @@
        override_bounds_(params.initial_bounds),
        initial_show_state_(params.initial_show_state),
        initial_workspace_(params.initial_workspace),
-@@ -830,7 +833,7 @@ Browser::WarnBeforeClosingResult Browser
+@@ -835,7 +838,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.
@@ -26,7 +26,7 @@
      return WarnBeforeClosingResult::kOkToClose;
  
    DCHECK(!warn_before_closing_callback_)
-@@ -860,6 +863,7 @@ bool Browser::TryToCloseWindow(
+@@ -865,6 +868,7 @@ bool Browser::TryToCloseWindow(
  
  void Browser::ResetTryToCloseWindow() {
    cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -34,7 +34,7 @@
    unload_controller_.ResetTryToCloseWindow();
  }
  
-@@ -2702,6 +2706,62 @@ bool Browser::CanCloseWithInProgressDown
+@@ -2698,6 +2702,62 @@ bool Browser::CanCloseWithInProgressDown
    return false;
  }
  
@@ -97,7 +97,7 @@
  void Browser::InProgressDownloadResponse(bool cancel_downloads) {
    if (cancel_downloads) {
      cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
-@@ -2720,6 +2780,22 @@ void Browser::InProgressDownloadResponse
+@@ -2716,6 +2776,22 @@ void Browser::InProgressDownloadResponse
  
    std::move(warn_before_closing_callback_)
        .Run(WarnBeforeClosingResult::kDoNotClose);
@@ -120,8 +120,8 @@
  }
  
  void Browser::FinishWarnBeforeClosing(WarnBeforeClosingResult result) {
---- chrome/browser/ui/browser.h.orig
-+++ chrome/browser/ui/browser.h
+--- a/chrome/browser/ui/browser.h
++++ b/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"
@@ -130,7 +130,7 @@
  #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
+@@ -1015,12 +1016,17 @@ class Browser : public TabStripModelObse
    // Returns true if the window can close, false otherwise.
    bool CanCloseWithInProgressDownloads();
  
@@ -148,7 +148,7 @@
    // 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
+@@ -1183,6 +1189,8 @@ class Browser : public TabStripModelObse
    // when the browser is closed with in-progress downloads.
    CancelDownloadConfirmationState cancel_download_confirmation_state_;
  
@@ -157,8 +157,8 @@
    /////////////////////////////////////////////////////////////////////////////
  
    // 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
+--- a/chrome/browser/ungoogled_flag_choices.h
++++ b/chrome/browser/ungoogled_flag_choices.h
 @@ -66,4 +66,13 @@ const FeatureEntry::Choice kCloseWindowW
       "close-window-with-last-tab",
       "never"},
@@ -173,9 +173,9 @@
 +     "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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -76,4 +76,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")},
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
index 6bb52b8..3f273e5 100644
--- 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
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig
-+++ chrome/browser/chrome_content_browser_client.cc
-@@ -743,6 +743,9 @@ bool HandleNewTabPageLocationOverride(
+--- a/chrome/browser/chrome_content_browser_client.cc
++++ b/chrome/browser/chrome_content_browser_client.cc
+@@ -771,6 +771,9 @@ bool HandleNewTabPageLocationOverride(
    Profile* profile = Profile::FromBrowserContext(browser_context);
    std::string ntp_location =
        profile->GetPrefs()->GetString(prefs::kNewTabPageLocationOverride);
@@ -10,9 +10,9 @@
    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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -80,4 +80,8 @@
       "Close Confirmation",
       "Show a warning prompt when closing the browser window.  ungoogled-chromium flag",
       kOsDesktop, MULTI_VALUE_TYPE(kCloseConfirmation)},
@@ -21,17 +21,17 @@
 +     "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);
+--- a/components/flags_ui/flags_state.cc
++++ b/components/flags_ui/flags_state.cc
+@@ -207,6 +207,7 @@ std::string GetCombinedOriginListValue(c
+       command_line.GetSwitchValueASCII(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
+@@ -395,6 +396,7 @@ void FlagsState::SetOriginListFlag(const
                                     const std::string& value,
                                     FlagsStorage* flags_storage) {
    const std::string 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
index 8fc406a..6c4ef2b 100644
--- 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
@@ -1,6 +1,6 @@
---- 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
+--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
++++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
+@@ -46,6 +46,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.
@@ -8,9 +8,9 @@
      return gfx::Size(42, 0);
    }
  };
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -76,4 +76,8 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -72,4 +72,8 @@
       "Disable QR Generator",
       "Disables the QR generator for sharing page links.  ungoogled-chromium flag",
       kOsDesktop, FEATURE_VALUE_TYPE(kDisableQRGenerator)},
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
index 0e695ce..e1c88a7 100644
--- 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
@@ -1,5 +1,5 @@
---- chrome/browser/ungoogled_flag_choices.h.orig
-+++ chrome/browser/ungoogled_flag_choices.h
+--- a/chrome/browser/ungoogled_flag_choices.h
++++ b/chrome/browser/ungoogled_flag_choices.h
 @@ -45,4 +45,19 @@ const FeatureEntry::Choice kBookmarkBarN
       "bookmark-bar-ntp",
       "never"},
@@ -20,9 +20,9 @@
 +     "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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -44,4 +44,8 @@
       "Bookmark Bar on New-Tab-Page",
       "Disable the Bookmark Bar on the New-Tab-Page.  ungoogled-chromium flag.",
       kOsDesktop, MULTI_VALUE_TYPE(kBookmarkBarNewTab)},
@@ -31,8 +31,8 @@
 +     "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
+--- a/components/omnibox/browser/autocomplete_controller.cc
++++ b/components/omnibox/browser/autocomplete_controller.cc
 @@ -15,6 +15,8 @@
  
  #include "base/bind.h"
@@ -42,7 +42,7 @@
  #include "base/feature_list.h"
  #include "base/format_macros.h"
  #include "base/metrics/histogram.h"
-@@ -276,6 +278,15 @@ AutocompleteController::AutocompleteCont
+@@ -272,6 +274,15 @@ AutocompleteController::AutocompleteCont
        search_service_worker_signal_sent_(false),
        template_url_service_(provider_client_->GetTemplateURLService()) {
    provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
@@ -58,9 +58,9 @@
    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
+--- a/components/omnibox/browser/history_url_provider.cc
++++ b/components/omnibox/browser/history_url_provider.cc
+@@ -472,6 +472,9 @@ void HistoryURLProvider::Start(const Aut
    if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
      matches_.push_back(what_you_typed_match);
  
@@ -70,8 +70,8 @@
    // 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
+--- a/components/omnibox/browser/search_provider.cc
++++ b/components/omnibox/browser/search_provider.cc
 @@ -12,6 +12,7 @@
  #include "base/base64.h"
  #include "base/bind.h"
@@ -90,8 +90,8 @@
    // 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
+--- a/components/url_formatter/url_fixer.cc
++++ b/components/url_formatter/url_fixer.cc
 @@ -9,6 +9,8 @@
  #include <algorithm>
  
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
index 5b52596..37a4834 100644
--- 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
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig
-+++ chrome/browser/chrome_content_browser_client.cc
-@@ -6001,7 +6001,7 @@ bool ChromeContentBrowserClient::ShouldA
+--- a/chrome/browser/chrome_content_browser_client.cc
++++ b/chrome/browser/chrome_content_browser_client.cc
+@@ -6068,7 +6068,7 @@ bool ChromeContentBrowserClient::ShouldA
      const url::Origin& embedder_origin,
      const content::PepperPluginInfo& plugin_info) {
  #if BUILDFLAG(ENABLE_PDF)
@@ -9,8 +9,8 @@
      return IsPdfInternalPluginAllowedOrigin(embedder_origin);
    }
  #endif  // BUILDFLAG(ENABLE_PDF)
---- chrome/browser/pdf/pdf_extension_util.cc.orig
-+++ chrome/browser/pdf/pdf_extension_util.cc
+--- a/chrome/browser/pdf/pdf_extension_util.cc
++++ b/chrome/browser/pdf/pdf_extension_util.cc
 @@ -170,7 +170,7 @@ std::string GetManifest() {
    DCHECK(manifest_contents.find(kNameTag) != std::string::npos);
    base::ReplaceFirstSubstringAfterOffset(
@@ -20,9 +20,9 @@
  
    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 :
+--- a/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc
++++ b/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc
+@@ -67,7 +67,7 @@ class PDFIFrameNavigationThrottleTest :
      // Register a fake PDF Viewer plugin into our plugin service.
      content::WebPluginInfo info;
      info.name =
@@ -31,8 +31,8 @@
      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
+--- a/chrome/browser/plugins/plugin_prefs.cc
++++ b/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.
@@ -42,8 +42,8 @@
  }
  
  }  // namespace
---- chrome/browser/plugins/plugin_prefs_unittest.cc.orig
-+++ chrome/browser/plugins/plugin_prefs_unittest.cc
+--- a/chrome/browser/plugins/plugin_prefs_unittest.cc
++++ b/chrome/browser/plugins/plugin_prefs_unittest.cc
 @@ -24,11 +24,11 @@ class PluginPrefsTest : public ::testing
  TEST_F(PluginPrefsTest, AlwaysOpenPdfExternally) {
    EXPECT_EQ(PluginPrefs::NO_POLICY,
@@ -58,8 +58,8 @@
 -                ChromeContentClient::kPDFExtensionPluginName)));
 +                ChromeContentClient::GetPDFExtensionPluginName())));
  }
---- chrome/browser/resources/plugin_metadata/plugins_chromeos.json.orig
-+++ chrome/browser/resources/plugin_metadata/plugins_chromeos.json
+--- a/chrome/browser/resources/plugin_metadata/plugins_chromeos.json
++++ b/chrome/browser/resources/plugin_metadata/plugins_chromeos.json
 @@ -44,6 +44,19 @@
      "name": "Chrome PDF Viewer",
      "group_name_matcher": "*Chrome PDF Viewer*"
@@ -100,8 +100,8 @@
    "chromium-pdf-plugin": {
      "mime_types": [
      ],
---- chrome/browser/resources/plugin_metadata/plugins_linux.json.orig
-+++ chrome/browser/resources/plugin_metadata/plugins_linux.json
+--- a/chrome/browser/resources/plugin_metadata/plugins_linux.json
++++ b/chrome/browser/resources/plugin_metadata/plugins_linux.json
 @@ -36,6 +36,19 @@
      "name": "Chrome PDF Viewer",
      "group_name_matcher": "*Chrome PDF Viewer*"
@@ -142,8 +142,8 @@
    "chromium-pdf-plugin": {
      "mime_types": [
      ],
---- chrome/browser/resources/plugin_metadata/plugins_mac.json.orig
-+++ chrome/browser/resources/plugin_metadata/plugins_mac.json
+--- a/chrome/browser/resources/plugin_metadata/plugins_mac.json
++++ b/chrome/browser/resources/plugin_metadata/plugins_mac.json
 @@ -33,6 +33,19 @@
      "name": "Chrome PDF Viewer",
      "group_name_matcher": "*Chrome PDF Viewer*"
@@ -184,8 +184,8 @@
    "chromium-pdf-plugin": {
      "mime_types": [
      ],
---- chrome/browser/resources/plugin_metadata/plugins_win.json.orig
-+++ chrome/browser/resources/plugin_metadata/plugins_win.json
+--- a/chrome/browser/resources/plugin_metadata/plugins_win.json
++++ b/chrome/browser/resources/plugin_metadata/plugins_win.json
 @@ -33,6 +33,19 @@
      "name": "Chrome PDF Viewer",
      "group_name_matcher": "*Chrome PDF Viewer*"
@@ -226,8 +226,8 @@
    "chromium-pdf-plugin": {
      "mime_types": [
      ],
---- chrome/browser/ungoogled_flag_choices.h.orig
-+++ chrome/browser/ungoogled_flag_choices.h
+--- a/chrome/browser/ungoogled_flag_choices.h
++++ b/chrome/browser/ungoogled_flag_choices.h
 @@ -34,4 +34,9 @@ const FeatureEntry::Choice kScrollEventC
       "scroll-tabs",
       "never"}
@@ -238,9 +238,9 @@
 +    {"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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -36,4 +36,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)},
@@ -249,9 +249,9 @@
 +     "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") {
+--- a/chrome/common/BUILD.gn
++++ b/chrome/common/BUILD.gn
+@@ -246,6 +246,7 @@ static_library("common") {
      "//components/no_state_prefetch/common",
      "//components/no_state_prefetch/common:mojo_bindings",
      "//components/page_load_metrics/common:common",
@@ -259,9 +259,9 @@
    ]
  
    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
+--- a/chrome/common/chrome_content_client.cc
++++ b/chrome/common/chrome_content_client.cc
+@@ -126,7 +126,7 @@ void ComputeBuiltInPlugins(std::vector<c
    content::PepperPluginInfo pdf_info;
    pdf_info.is_internal = true;
    pdf_info.is_out_of_process = true;
@@ -270,9 +270,9 @@
    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
+--- a/chrome/common/chrome_content_client.h
++++ b/chrome/common/chrome_content_client.h
+@@ -41,8 +41,8 @@ class ChromeContentClient : public conte
    static const base::FilePath::CharType kNaClPluginFileName[];
  #endif
  
@@ -283,8 +283,8 @@
    static const base::FilePath::CharType kPDFPluginPath[];
  
    ChromeContentClient();
---- chrome/common/chrome_content_client_constants.cc.orig
-+++ chrome/common/chrome_content_client_constants.cc
+--- a/chrome/common/chrome_content_client_constants.cc
++++ b/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.
@@ -358,9 +358,9 @@
  
  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::
+--- a/chrome/renderer/chrome_content_renderer_client.cc
++++ b/chrome/renderer/chrome_content_renderer_client.cc
+@@ -1027,7 +1027,7 @@ WebPlugin* ChromeContentRendererClient::
              }
            }
          } else if (info.name ==
@@ -369,7 +369,7 @@
            // 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::
+@@ -1059,7 +1059,7 @@ WebPlugin* ChromeContentRendererClient::
  
  #if BUILDFLAG(ENABLE_PDF)
          if (info.name ==
@@ -378,7 +378,7 @@
            return pdf::CreateInternalPlugin(
                info, std::move(params), render_frame,
                std::make_unique<ChromePdfInternalPluginDelegate>());
-@@ -1092,7 +1092,7 @@ WebPlugin* ChromeContentRendererClient::
+@@ -1072,7 +1072,7 @@ WebPlugin* ChromeContentRendererClient::
          PluginUMAReporter::GetInstance()->ReportPluginDisabled(orig_mime_type,
                                                                 url);
          if (info.name ==
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
index 5b97e10..553782e 100644
--- 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
@@ -1,21 +1,21 @@
---- 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)
- };
+--- a/chrome/browser/sharing/features.cc
++++ b/chrome/browser/sharing/features.cc
+@@ -26,3 +26,5 @@ const base::Feature kSharingSendViaSync{
+ 
+ const base::Feature kSharingPreferVapid {
+   "SharingPreferVapid", base::FEATURE_DISABLED_BY_DEFAULT};
 +
 +const base::Feature kDisableQRGenerator{"DisableQRGenerator", base::FEATURE_DISABLED_BY_DEFAULT};
---- chrome/browser/sharing/features.h.orig
-+++ chrome/browser/sharing/features.h
+--- a/chrome/browser/sharing/features.h
++++ b/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
+--- a/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc
++++ b/chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_controller.cc
 @@ -23,7 +23,7 @@ QRCodeGeneratorBubbleController::~QRCode
  
  // static
@@ -25,9 +25,9 @@
      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() {
+--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
++++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
+@@ -298,7 +298,8 @@ void LocationBarView::Init() {
      // the left most icon.
      params.types_enabled.push_back(PageActionIconType::kSendTabToSelf);
      params.types_enabled.push_back(PageActionIconType::kClickToCall);
@@ -37,9 +37,9 @@
      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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -68,4 +68,8 @@
       "Remove Tabsearch Button",
       "Removes the tabsearch button from the tabstrip.  ungoogled-chromium flag",
       kOsDesktop, SINGLE_VALUE_TYPE("remove-tabsearch-button")},
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
index b80101e..13197f8 100644
--- 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
@@ -1,8 +1,8 @@
 # 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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -12,4 +12,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)},
@@ -11,8 +11,8 @@
 +     "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
+--- a/chrome/renderer/chrome_render_frame_observer.cc
++++ b/chrome/renderer/chrome_render_frame_observer.cc
 @@ -139,9 +139,10 @@ ChromeRenderFrameObserver::ChromeRenderF
    if (!render_frame->IsMainFrame())
      return;
@@ -25,7 +25,7 @@
    if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection))
      SetClientSidePhishingDetection();
  #endif
-@@ -201,14 +202,16 @@ void ChromeRenderFrameObserver::DidFinis
+@@ -200,14 +201,16 @@ void ChromeRenderFrameObserver::DidFinis
    if (frame->Parent())
      return;
  
@@ -50,9 +50,9 @@
    }
  }
  
---- chrome/renderer/chrome_render_frame_observer.h.orig
-+++ chrome/renderer/chrome_render_frame_observer.h
-@@ -139,6 +139,7 @@ class ChromeRenderFrameObserver : public
+--- a/chrome/renderer/chrome_render_frame_observer.h
++++ b/chrome/renderer/chrome_render_frame_observer.h
+@@ -138,6 +138,7 @@ class ChromeRenderFrameObserver : public
  #if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
    safe_browsing::PhishingClassifierDelegate* phishing_classifier_ = nullptr;
  #endif
@@ -60,8 +60,8 @@
  
    // 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
+--- a/components/search_engines/template_url_service.cc
++++ b/components/search_engines/template_url_service.cc
 @@ -12,6 +12,7 @@
  #include "base/bind.h"
  #include "base/callback.h"
@@ -70,7 +70,7 @@
  #include "base/containers/contains.h"
  #include "base/debug/crash_logging.h"
  #include "base/format_macros.h"
-@@ -197,6 +198,12 @@ bool IsCreatedByExtension(const Template
+@@ -199,6 +200,12 @@ bool IsCreatedByExtension(const Template
           template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION;
  }
  
@@ -83,7 +83,7 @@
  }  // namespace
  
  // TemplateURLService::LessWithPrefix -----------------------------------------
-@@ -282,6 +289,7 @@ TemplateURLService::TemplateURLService(
+@@ -284,6 +291,7 @@ TemplateURLService::TemplateURLService(
      std::unique_ptr<TemplateURLServiceClient> client,
      const base::RepeatingClosure& dsp_change_callback)
      : prefs_(prefs),
@@ -91,7 +91,7 @@
        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
+@@ -365,8 +373,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.
@@ -102,7 +102,7 @@
  }
  
  bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
-@@ -1496,6 +1504,8 @@ SyncDataMap TemplateURLService::CreateGU
+@@ -1502,6 +1510,8 @@ SyncDataMap TemplateURLService::CreateGU
  
  void TemplateURLService::Init(const Initializer* initializers,
                                int num_initializers) {
@@ -111,7 +111,7 @@
    if (client_)
      client_->SetOwner(this);
  
-@@ -1632,6 +1642,9 @@ void TemplateURLService::ChangeToLoadedS
+@@ -1638,6 +1648,9 @@ void TemplateURLService::ChangeToLoadedS
  
  bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
      const std::string& host) const {
@@ -121,11 +121,11 @@
    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
+--- a/components/search_engines/template_url_service.h
++++ b/components/search_engines/template_url_service.h
 @@ -706,6 +706,8 @@ class TemplateURLService : public WebDat
    // ---------- Browser state related members ---------------------------------
-   PrefService* prefs_ = nullptr;
+   raw_ptr<PrefService> prefs_ = nullptr;
  
 +  bool should_autocollect_; // Whether search engines should be auto-collected
 +
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
index 6010902..aac7b9d 100644
--- 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
@@ -1,5 +1,5 @@
---- chrome/browser/ui/views/tabs/tab.cc.orig
-+++ chrome/browser/ui/views/tabs/tab.cc
+--- a/chrome/browser/ui/views/tabs/tab.cc
++++ b/chrome/browser/ui/views/tabs/tab.cc
 @@ -12,6 +12,7 @@
  #include <utility>
  
@@ -7,7 +7,7 @@
 +#include "base/command_line.h"
  #include "base/debug/alias.h"
  #include "base/i18n/rtl.h"
- #include "base/metrics/user_metrics.h"
+ #include "base/memory/raw_ptr.h"
 @@ -641,6 +642,8 @@ void Tab::OnGestureEvent(ui::GestureEven
  }
  
@@ -17,9 +17,9 @@
    // 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 @@
+--- a/chrome/browser/ui/views/tabs/tab_strip.cc
++++ b/chrome/browser/ui/views/tabs/tab_strip.cc
+@@ -16,6 +16,7 @@
  
  #include "base/bind.h"
  #include "base/callback.h"
@@ -27,7 +27,7 @@
  #include "base/compiler_specific.h"
  #include "base/containers/adapters.h"
  #include "base/containers/contains.h"
-@@ -2153,6 +2154,8 @@ void TabStrip::OnMouseEventInTab(views::
+@@ -1904,6 +1905,8 @@ void TabStrip::OnMouseEventInTab(views::
  }
  
  void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {
@@ -36,8 +36,8 @@
    // 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
+--- a/chrome/browser/ungoogled_flag_choices.h
++++ b/chrome/browser/ungoogled_flag_choices.h
 @@ -75,4 +75,13 @@ const FeatureEntry::Choice kCloseConfirm
       "close-confirmation",
       "multiple"},
@@ -52,9 +52,9 @@
 +     "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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -84,4 +84,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", "")},
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
index 317602c..e3ce3e5 100644
--- 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
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_command_controller.cc.orig
-+++ chrome/browser/ui/browser_command_controller.cc
-@@ -1139,7 +1139,8 @@ void BrowserCommandController::InitComma
+--- a/chrome/browser/ui/browser_command_controller.cc
++++ b/chrome/browser/ui/browser_command_controller.cc
+@@ -1160,7 +1160,8 @@ void BrowserCommandController::InitComma
    command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
                                          normal_window);
  
@@ -10,8 +10,8 @@
    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
+--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
++++ b/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"
  
@@ -20,19 +20,19 @@
  #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
+@@ -137,7 +138,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() &&
+   }
+ 
+-  if (browser->is_type_normal()) {
++  if (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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -64,4 +64,8 @@
       "Clear data on exit",
       "Clears all browsing data on exit.  ungoogled-chromium flag",
       kOsDesktop, FEATURE_VALUE_TYPE(browsing_data::features::kClearDataOnExit)},
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
index 070c4cd..a10762f 100644
--- 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
@@ -1,6 +1,6 @@
---- 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 @@
+--- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
++++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
+@@ -25,6 +25,7 @@
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/profiles/profile_manager.h"
  #include "chrome/browser/sync/sync_service_factory.h"
@@ -8,7 +8,7 @@
  #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
+@@ -157,6 +158,21 @@ class BrowsingDataRemoverObserver
  #endif
  };
  
@@ -29,20 +29,20 @@
 +
  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::
+   for (const auto& data_type : data_types.GetListDeprecated()) {
+@@ -307,8 +323,9 @@ void ChromeBrowsingDataLifetimeManager::
      bool keep_browser_alive) {
    auto* data_types = profile_->GetPrefs()->GetList(
        browsing_data::prefs::kClearBrowsingDataOnExitList);
--  if (data_types && !data_types->GetList().empty() &&
+-  if (data_types && !data_types->GetListDeprecated().empty() &&
 -      !SyncServiceFactory::IsSyncAllowed(profile_)) {
 +  bool cdoe = base::FeatureList::IsEnabled(browsing_data::features::kClearDataOnExit);
-+  if (cdoe || (data_types && !data_types->GetList().empty() &&
++  if (cdoe || (data_types && !data_types->GetListDeprecated().empty() &&
 +      !SyncServiceFactory::IsSyncAllowed(profile_))) {
      profile_->GetPrefs()->SetBoolean(
          browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true);
      auto* remover = profile_->GetBrowsingDataRemover();
-@@ -304,8 +321,8 @@ void ChromeBrowsingDataLifetimeManager::
+@@ -319,8 +336,8 @@ void ChromeBrowsingDataLifetimeManager::
        DCHECK(keep_browser_alive);
  #endif
      remover->RemoveAndReply(base::Time(), base::Time::Max(),
@@ -53,8 +53,8 @@
                              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
+--- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_factory.cc
++++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_factory.cc
 @@ -48,6 +48,8 @@ ChromeBrowsingDataLifetimeManagerFactory
  KeyedService* ChromeBrowsingDataLifetimeManagerFactory::BuildServiceInstanceFor(
      content::BrowserContext* context) const {
@@ -64,9 +64,9 @@
            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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -60,4 +60,8 @@
       "Keep old history",
       "Keep history older than 3 months.  ungoogled-chromium flag",
       kOsAll, SINGLE_VALUE_TYPE("keep-old-history")},
@@ -75,8 +75,8 @@
 +     "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
+--- a/components/browsing_data/core/features.cc
++++ b/components/browsing_data/core/features.cc
 @@ -19,5 +19,7 @@ const base::Feature kEnableBrowsingDataL
  const base::Feature kEnableBrowsingDataLifetimeManager{
      "BrowsingDataLifetimeManager", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -85,8 +85,8 @@
 +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
+--- a/components/browsing_data/core/features.h
++++ b/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;
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
index b0358e8..5c9dbac 100644
--- 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
@@ -1,5 +1,5 @@
---- chrome/browser/ui/tabs/tab_strip_model.cc.orig
-+++ chrome/browser/ui/tabs/tab_strip_model.cc
+--- a/chrome/browser/ui/tabs/tab_strip_model.cc
++++ b/chrome/browser/ui/tabs/tab_strip_model.cc
 @@ -11,6 +11,7 @@
  #include <utility>
  
@@ -7,8 +7,8 @@
 +#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
+ #include "base/memory/raw_ptr.h"
+@@ -1875,6 +1876,10 @@ bool TabStripModel::CloseTabs(base::span
    if (items.empty())
      return true;
  
@@ -19,8 +19,8 @@
    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
+--- a/chrome/browser/ungoogled_flag_choices.h
++++ b/chrome/browser/ungoogled_flag_choices.h
 @@ -60,4 +60,10 @@ const FeatureEntry::Choice kOmniboxAutoc
       "omnibox-autocomplete-filtering",
       "search-bookmarks-chrome"},
@@ -32,9 +32,9 @@
 +     "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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -48,4 +48,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)},
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
index 381de61..e50637e 100644
--- 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
@@ -1,8 +1,8 @@
 # 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
+--- a/chrome/browser/download/download_crx_util.cc
++++ b/chrome/browser/download/download_crx_util.cc
 @@ -8,6 +8,7 @@
  
  #include <memory>
@@ -35,8 +35,8 @@
    } else {
      return false;
    }
---- chrome/browser/download/download_crx_util.h.orig
-+++ chrome/browser/download/download_crx_util.h
+--- a/chrome/browser/download/download_crx_util.h
++++ b/chrome/browser/download/download_crx_util.h
 @@ -43,6 +43,10 @@ scoped_refptr<extensions::CrxInstaller>
      Profile* profile,
      const download::DownloadItem& download_item);
@@ -48,9 +48,9 @@
  // 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
+--- a/chrome/browser/download/download_target_determiner.cc
++++ b/chrome/browser/download/download_target_determiner.cc
+@@ -1057,10 +1057,12 @@ DownloadConfirmationReason DownloadTarge
      return DownloadConfirmationReason::SAVE_AS;
  
  #if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -67,8 +67,8 @@
  #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
+--- a/chrome/browser/extensions/extension_management.cc
++++ b/chrome/browser/extensions/extension_management.cc
 @@ -10,6 +10,7 @@
  
  #include "base/bind.h"
@@ -91,8 +91,8 @@
    // 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
+--- a/chrome/browser/ungoogled_flag_choices.h
++++ b/chrome/browser/ungoogled_flag_choices.h
 @@ -4,4 +4,13 @@
  
  #ifndef CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
@@ -107,12 +107,12 @@
 +     "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")},
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/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)},
 +    {"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.",
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
index 9a31082..da6544e 100644
--- 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
@@ -1,8 +1,8 @@
 # Make popups go to tabs instead
 
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -56,4 +56,8 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -52,4 +52,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)},
@@ -11,19 +11,20 @@
 +     "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
+--- a/content/renderer/render_view_impl.cc
++++ b/content/renderer/render_view_impl.cc
+@@ -74,6 +74,9 @@ 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;
+     case blink::kWebNavigationPolicyPictureInPicture:
        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
+--- a/ui/base/mojom/window_open_disposition_mojom_traits.h
++++ b/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_
@@ -32,16 +33,16 @@
  #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;
+@@ -30,6 +31,8 @@ struct EnumTraits<ui::mojom::WindowOpenD
+       case WindowOpenDisposition::NEW_PICTURE_IN_PICTURE:
+         return ui::mojom::WindowOpenDisposition::NEW_PICTURE_IN_PICTURE;
        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
+@@ -68,6 +71,8 @@ struct EnumTraits<ui::mojom::WindowOpenD
          return true;
        case ui::mojom::WindowOpenDisposition::NEW_POPUP:
          *out = WindowOpenDisposition::NEW_POPUP;
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
index c46ec2b..c2678af 100644
--- 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
@@ -1,8 +1,8 @@
 # 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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -16,4 +16,8 @@
       "Disable search engine collection",
       "Prevents search engines from being added automatically.  ungoogled-chromium flag.",
       kOsAll, SINGLE_VALUE_TYPE("disable-search-engine-collection")},
@@ -11,17 +11,17 @@
 +     "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
+--- a/components/javascript_dialogs/app_modal_dialog_manager.cc
++++ b/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
+ #include "base/strings/utf_string_conversions.h"
+@@ -195,7 +196,8 @@ void AppModalDialogManager::RunBeforeUnl
    ChromeJavaScriptDialogExtraData* extra_data =
        &javascript_dialog_extra_data_[web_contents];
  
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
index 090432a..f377414 100644
--- 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
@@ -1,8 +1,8 @@
 # Keep local history longer than 90 days
 
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -60,4 +60,8 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -56,4 +56,8 @@
       "Popups to tabs",
       "Makes popups open in new tabs.  ungoogled-chromium flag",
       kOsAll, SINGLE_VALUE_TYPE("popups-to-tabs")},
@@ -11,8 +11,8 @@
 +     "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
+--- a/components/history/core/browser/history_backend.cc
++++ b/components/history/core/browser/history_backend.cc
 @@ -15,6 +15,7 @@
  #include <vector>
  
@@ -21,7 +21,7 @@
  #include "base/callback_helpers.h"
  #include "base/compiler_specific.h"
  #include "base/containers/flat_set.h"
-@@ -911,7 +912,8 @@ void HistoryBackend::InitImpl(
+@@ -977,7 +978,8 @@ void HistoryBackend::InitImpl(
    db_->GetStartDate(&first_recorded_time_);
  
    // Start expiring old stuff.
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
index be26b2c..840f91a 100644
--- 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
@@ -1,8 +1,8 @@
 # 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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -20,4 +20,8 @@
       "Disable beforeunload",
       "Disables JavaScript dialog boxes triggered by beforeunload.  ungoogled-chromium flag.",
       kOsAll, SINGLE_VALUE_TYPE("disable-beforeunload")},
@@ -11,17 +11,17 @@
 +     "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 @@
+--- a/components/url_formatter/url_formatter.cc
++++ b/components/url_formatter/url_formatter.cc
+@@ -9,6 +9,7 @@
  #include <utility>
  #include <vector>
  
 +#include "base/command_line.h"
  #include "base/lazy_instance.h"
+ #include "base/memory/raw_ptr.h"
  #include "base/numerics/safe_conversions.h"
- #include "base/strings/strcat.h"
-@@ -264,6 +265,13 @@ IDNConversionResult IDNToUnicodeWithAdju
+@@ -270,6 +271,13 @@ IDNConversionResult IDNToUnicodeWithAdju
    host16.reserve(host.length());
    host16.insert(host16.end(), host.begin(), host.end());
  
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
index 87da094..a7a43aa 100644
--- 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
@@ -1,21 +1,21 @@
 # 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))
+--- a/chrome/browser/ui/startup/infobar_utils.cc
++++ b/chrome/browser/ui/startup/infobar_utils.cc
+@@ -80,7 +80,8 @@ void AddInfoBarsIfNecessary(Browser* bro
      return;
  
--  if (HasPendingUncleanExit(browser->profile()))
-+  if (HasPendingUncleanExit(browser->profile()) &&
-+      !command_line_.HasSwitch("hide-crashed-bubble"))
+   // Web apps should not display the session restore bubble (crbug.com/1264121)
+-  if (!is_web_app && HasPendingUncleanExit(browser->profile()))
++  if (!is_web_app && HasPendingUncleanExit(browser->profile()) &&
++      !startup_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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -28,4 +28,8 @@
       "Show avatar/people/profile button",
       "Show avatar/people/profile button in the browser toolbar.  ungoogled-chromium flag.",
       kOsDesktop, MULTI_VALUE_TYPE(kShowAvatarButtonChoices)},
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
index 7937d6f..085b6b2 100644
--- 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
@@ -1,17 +1,29 @@
---- chrome/browser/ui/views/tabs/tab_strip.cc.orig
-+++ chrome/browser/ui/views/tabs/tab_strip.cc
-@@ -1909,6 +1909,8 @@ bool TabStrip::SupportsMultipleSelection
- }
+--- a/chrome/browser/ui/views/tabs/tab.cc
++++ b/chrome/browser/ui/views/tabs/tab.cc
+@@ -978,7 +978,11 @@ void Tab::UpdateIconVisibility() {
+   if (IsActive()) {
+     // Close button is shown on active tabs regardless of the size.
+     showing_close_button_ = true;
++    if (base::CommandLine::ForCurrentProcess()->HasSwitch("hide-tab-close-buttons")) {
++      showing_close_button_ = false;
++    } else {
+     available_width -= close_button_width;
++    }
  
- 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 @@
+     showing_alert_indicator_ =
+         has_alert_icon && alert_icon_width <= available_width;
+@@ -999,6 +1003,8 @@ void Tab::UpdateIconVisibility() {
+       available_width -= favicon_width;
+ 
+     showing_close_button_ = large_enough_for_close_button;
++    if (base::CommandLine::ForCurrentProcess()->HasSwitch("hide-tab-close-buttons"))
++      showing_close_button_ = false;
+     if (showing_close_button_)
+       available_width -= close_button_width;
+ 
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -88,4 +88,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)},
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
index d657480..e1a6886 100644
--- 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
@@ -1,5 +1,5 @@
---- chrome/browser/ui/views/frame/browser_root_view.cc.orig
-+++ chrome/browser/ui/views/frame/browser_root_view.cc
+--- a/chrome/browser/ui/views/frame/browser_root_view.cc
++++ b/chrome/browser/ui/views/frame/browser_root_view.cc
 @@ -11,6 +11,7 @@
  
  #include "base/bind.h"
@@ -38,7 +38,7 @@
  
  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
+@@ -255,7 +270,7 @@ bool BrowserRootView::OnMouseWheel(const
  
    // Scroll-event-changes-tab is incompatible with scrolling tabstrip, so
    // disable it if the latter feature is enabled.
@@ -47,9 +47,9 @@
        !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
+--- a/chrome/browser/ui/views/frame/browser_root_view.h
++++ b/chrome/browser/ui/views/frame/browser_root_view.h
+@@ -144,6 +144,8 @@ class BrowserRootView : public views::in
    int scroll_remainder_x_ = 0;
    int scroll_remainder_y_ = 0;
  
@@ -58,8 +58,8 @@
    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
+--- a/chrome/browser/ungoogled_flag_choices.h
++++ b/chrome/browser/ungoogled_flag_choices.h
 @@ -25,4 +25,13 @@ const FeatureEntry::Choice kShowAvatarBu
       "show-avatar-button",
       "never"}
@@ -74,9 +74,9 @@
 +     "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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -32,4 +32,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")},
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
index 8fe39bd..6035274 100644
--- 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
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/toolbar/toolbar_view.cc.orig
-+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
-@@ -273,12 +273,28 @@ void ToolbarView::Init() {
+--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
++++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
+@@ -282,14 +282,30 @@ void ToolbarView::Init() {
  
    std::unique_ptr<ToolbarAccountIconContainerView>
        toolbar_account_icon_container;
@@ -19,6 +19,8 @@
 -  show_avatar_toolbar_button = browser_->profile()->IsOffTheRecord() ||
 -                               browser_->profile()->IsGuestSession();
 +  show_avatar_toolbar_button = in_incognito_or_guest_mode;
+ #elif BUILDFLAG(IS_CHROMEOS_LACROS)
+   show_avatar_toolbar_button = !profiles::IsPublicSession();
  #endif
 +
 +  if (flag_value == "always")
@@ -31,8 +33,8 @@
    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
+--- a/chrome/browser/ungoogled_flag_choices.h
++++ b/chrome/browser/ungoogled_flag_choices.h
 @@ -13,4 +13,16 @@ const FeatureEntry::Choice kExtensionHan
       "extension-mime-request-handling",
       "always-prompt-for-install"},
@@ -50,9 +52,9 @@
 +     "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 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -24,4 +24,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")},
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
index 0bc5dd5..ce33ec4 100644
--- 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
@@ -1,7 +1,7 @@
 # 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
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
 @@ -4,4 +4,8 @@
  
  #ifndef CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
@@ -11,30 +11,30 @@
 +     "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};
+--- a/net/base/features.cc
++++ b/net/base/features.cc
+@@ -259,5 +259,7 @@ const base::Feature kRecordRadioWakeupTr
+ const base::Feature kSandboxHttpCache("SandboxHttpCache",
+                                       base::FEATURE_DISABLED_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;
+--- a/net/base/features.h
++++ b/net/base/features.h
+@@ -390,6 +390,8 @@ NET_EXPORT extern const base::Feature kR
+ // the network process to be sandboxed.
+ NET_EXPORT extern const base::Feature kSandboxHttpCache;
  
 +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
+--- a/net/dns/host_resolver_manager.cc
++++ b/net/dns/host_resolver_manager.cc
+@@ -151,11 +151,6 @@ const unsigned kMinimumTTLSeconds = kCac
  // cached.
  const int kIPv6ProbePeriodMs = 1000;
  
@@ -46,7 +46,7 @@
  enum DnsResolveStatus {
    RESOLVE_STATUS_DNS_SUCCESS = 0,
    RESOLVE_STATUS_PROC_SUCCESS,
-@@ -3696,7 +3691,7 @@ bool HostResolverManager::IsIPv6Reachabl
+@@ -3907,7 +3902,7 @@ bool HostResolverManager::IsIPv6Reachabl
        (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
            kIPv6ProbePeriodMs) {
      SetLastIPv6ProbeResult(
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
index 9ff8cfa..1b30554 100644
--- 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
@@ -1,8 +1,8 @@
 # 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
+--- a/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.html
++++ b/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.html
 @@ -20,6 +20,13 @@
              value="{{queryUrl_}}" on-focus="validate_" on-input="validate_"
              disabled$="[[model.urlLocked]]">
@@ -17,9 +17,9 @@
        </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
+--- a/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.ts
++++ b/chrome/browser/resources/settings/search_engines_page/search_engine_edit_dialog.ts
+@@ -28,6 +28,7 @@ export interface SettingsSearchEngineEdi
      dialog: CrDialogElement,
      keyword: CrInputElement,
      queryUrl: CrInputElement,
@@ -27,23 +27,23 @@
      searchEngine: CrInputElement,
    };
  }
-@@ -54,6 +55,7 @@ class SettingsSearchEngineDialogElement
+@@ -56,6 +57,7 @@ export class SettingsSearchEngineEditDia
        searchEngine_: String,
        keyword_: String,
        queryUrl_: String,
 +      suggestionsUrl_: String,
        dialogTitle_: String,
+       keywordFieldLabel_: String,
        actionButtonText_: String,
-     };
-@@ -63,6 +65,7 @@ class SettingsSearchEngineDialogElement
+@@ -72,6 +74,7 @@ export class SettingsSearchEngineEditDia
    private searchEngine_: string;
    private keyword_: string;
    private queryUrl_: string;
 +  private suggestionsUrl_: string;
    private dialogTitle_: string;
+   private keywordFieldLabel_: string;
    private actionButtonText_: string;
-   private browserProxy_: SearchEnginesBrowserProxy =
-@@ -92,6 +95,7 @@ class SettingsSearchEngineDialogElement
+@@ -103,6 +106,7 @@ export class SettingsSearchEngineEditDia
        this.searchEngine_ = this.model.name;
        this.keyword_ = this.model.keyword;
        this.queryUrl_ = this.model.url;
@@ -51,7 +51,7 @@
      } else {
        this.dialogTitle_ =
            loadTimeData.getString('searchEnginesAddSearchEngine');
-@@ -127,8 +131,12 @@ class SettingsSearchEngineDialogElement
+@@ -142,8 +146,12 @@ export class SettingsSearchEngineEditDia
        }
      }
  
@@ -66,7 +66,7 @@
    }
  
    private cancel_() {
-@@ -137,7 +145,8 @@ class SettingsSearchEngineDialogElement
+@@ -152,7 +160,8 @@ export class SettingsSearchEngineEditDia
  
    private onActionButtonTap_() {
      this.browserProxy_.searchEngineEditCompleted(
@@ -76,7 +76,7 @@
      this.$.dialog.close();
    }
  
-@@ -165,9 +174,11 @@ class SettingsSearchEngineDialogElement
+@@ -180,9 +189,11 @@ export class SettingsSearchEngineEditDia
  
    private updateActionButtonState_() {
      const allValid = [
@@ -90,17 +90,17 @@
      });
      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,
+--- a/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
++++ b/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.ts
+@@ -31,6 +31,7 @@ export type SearchEngine = {
    name: string,
+   shouldConfirmDeletion: boolean,
    url: string,
 +  suggestionsUrl: string,
    urlLocked: boolean,
  };
  
-@@ -53,7 +54,7 @@ export interface SearchEnginesBrowserPro
+@@ -73,7 +74,7 @@ export interface SearchEnginesBrowserPro
    searchEngineEditCancelled(): void;
  
    searchEngineEditCompleted(
@@ -109,7 +109,7 @@
  
    getSearchEnginesList(): Promise<SearchEnginesInfo>;
  
-@@ -84,11 +85,12 @@ export class SearchEnginesBrowserProxyIm
+@@ -114,11 +115,12 @@ export class SearchEnginesBrowserProxyIm
    }
  
    searchEngineEditCompleted(
@@ -123,8 +123,8 @@
      ]);
    }
  
---- chrome/browser/ui/search_engines/edit_search_engine_controller.cc.orig
-+++ chrome/browser/ui/search_engines/edit_search_engine_controller.cc
+--- a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
++++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
 @@ -67,6 +67,15 @@ bool EditSearchEngineController::IsURLVa
        .is_valid();
  }
@@ -165,8 +165,8 @@
    }
  }
  
---- chrome/browser/ui/search_engines/edit_search_engine_controller.h.orig
-+++ chrome/browser/ui/search_engines/edit_search_engine_controller.h
+--- a/chrome/browser/ui/search_engines/edit_search_engine_controller.h
++++ b/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,
@@ -196,8 +196,8 @@
  
    // 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
+--- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc
++++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc
 @@ -21,23 +21,27 @@ KeywordEditorController::KeywordEditorCo
  KeywordEditorController::~KeywordEditorController() {
  }
@@ -249,8 +249,8 @@
  
    base::RecordAction(UserMetricsAction("KeywordEditor_ModifiedKeyword"));
  }
---- chrome/browser/ui/search_engines/keyword_editor_controller.h.orig
-+++ chrome/browser/ui/search_engines/keyword_editor_controller.h
+--- a/chrome/browser/ui/search_engines/keyword_editor_controller.h
++++ b/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,
@@ -270,9 +270,9 @@
  
    // 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
+--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
++++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
+@@ -108,21 +108,25 @@ void TemplateURLTableModel::Remove(int i
  void TemplateURLTableModel::Add(int index,
                                  const std::u16string& short_name,
                                  const std::u16string& keyword,
@@ -303,7 +303,7 @@
    DCHECK(index >= 0 && index <= RowCount());
    DCHECK(!url.empty());
    TemplateURL* template_url = GetTemplateURL(index);
-@@ -132,7 +136,8 @@ void TemplateURLTableModel::ModifyTempla
+@@ -131,7 +135,8 @@ void TemplateURLTableModel::ModifyTempla
    DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
           template_url->SupportsReplacement(
               template_url_service_->search_terms_data()));
@@ -313,9 +313,9 @@
  }
  
  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:
+--- a/chrome/browser/ui/search_engines/template_url_table_model.h
++++ b/chrome/browser/ui/search_engines/template_url_table_model.h
+@@ -53,13 +53,15 @@ class TemplateURLTableModel : public ui:
    void Add(int index,
             const std::u16string& short_name,
             const std::u16string& keyword,
@@ -333,8 +333,8 @@
  
    // 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
+--- a/chrome/browser/ui/webui/settings/search_engines_handler.cc
++++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc
 @@ -37,6 +37,7 @@ namespace {
  const char kSearchEngineField[] = "searchEngine";
  const char kKeywordField[] = "keyword";
@@ -345,12 +345,12 @@
  const int kNewSearchEngineIndex = -1;
 @@ -212,6 +213,9 @@ SearchEnginesHandler::CreateDictionaryFo
    Profile* profile = Profile::FromWebUI(web_ui());
-   dict->SetString(
+   dict->SetStringKey(
        "url", template_url->url_ref().DisplayURL(UIThreadSearchTermsData()));
-+  dict->SetString("suggestionsUrl",
++  dict->SetStringKey("suggestionsUrl",
 +                  template_url->suggestions_url_ref().DisplayURL(
 +                      UIThreadSearchTermsData()));
-   dict->SetBoolean("urlLocked", template_url->prepopulate_id() > 0);
+   dict->SetBoolKey("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
@@ -371,7 +371,7 @@
  
    edit_controller_.reset();
  }
-@@ -361,6 +367,8 @@ bool SearchEnginesHandler::CheckFieldVal
+@@ -358,6 +364,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);
@@ -380,15 +380,11 @@
    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));
+@@ -379,14 +387,17 @@ void SearchEnginesHandler::HandleSearchE
+   const std::string& search_engine = args[0].GetString();
+   const std::string& keyword = args[1].GetString();
+   const std::string& query_url = args[2].GetString();
++  const std::string& suggestions_url = args[3].GetString();
  
    // 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.
@@ -404,9 +400,9 @@
    }
  }
  
---- 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
+--- a/chrome/browser/ui/webui/settings/search_engines_handler.h
++++ b/chrome/browser/ui/webui/settings/search_engines_handler.h
+@@ -45,7 +45,8 @@ class SearchEnginesHandler : public Sett
    void OnEditedKeyword(TemplateURL* template_url,
                         const std::u16string& title,
                         const std::u16string& keyword,
@@ -416,9 +412,9 @@
  
    // SettingsPageUIHandler implementation.
    void RegisterMessages() override;
-@@ -82,8 +83,8 @@ class SearchEnginesHandler : public Sett
+@@ -77,8 +78,8 @@ class SearchEnginesHandler : public Sett
    // to WebUI. Called from WebUI.
-   void HandleValidateSearchEngineInput(const base::ListValue* args);
+   void HandleValidateSearchEngineInput(base::Value::ConstListView args);
  
 -  // Checks whether the given user input field (searchEngine, keyword, queryUrl)
 -  // is populated with a valid value.
@@ -427,9 +423,9 @@
    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
+--- a/components/search_engines/template_url_service.cc
++++ b/components/search_engines/template_url_service.cc
+@@ -643,7 +643,8 @@ void TemplateURLService::IncrementUsageC
  void TemplateURLService::ResetTemplateURL(TemplateURL* url,
                                            const std::u16string& title,
                                            const std::u16string& keyword,
@@ -439,7 +435,7 @@
    DCHECK(!IsCreatedByExtension(url));
    DCHECK(!keyword.empty());
    DCHECK(!search_url.empty());
-@@ -656,6 +657,7 @@ void TemplateURLService::ResetTemplateUR
+@@ -658,6 +659,7 @@ void TemplateURLService::ResetTemplateUR
    data.safe_for_autoreplace = false;
    data.last_modified = clock_->Now();
    data.is_active = TemplateURLData::ActiveStatus::kTrue;
@@ -447,8 +443,8 @@
  
    Update(url, TemplateURL(data));
  }
---- components/search_engines/template_url_service.h.orig
-+++ components/search_engines/template_url_service.h
+--- a/components/search_engines/template_url_service.h
++++ b/components/search_engines/template_url_service.h
 @@ -253,7 +253,8 @@ class TemplateURLService : public WebDat
    void ResetTemplateURL(TemplateURL* url,
                          const std::u16string& title,
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
index 4a78da1..3c6d4f8 100644
--- 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
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig
-+++ chrome/browser/about_flags.cc
-@@ -2728,7 +2728,13 @@ const FeatureEntry::FeatureVariation kWi
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -2865,7 +2865,13 @@ constexpr FeatureEntry::FeatureVariation
  // calculate and verify checksum.
  //
  // When adding a new choice, add it to the end of the list.
@@ -15,7 +15,7 @@
  // //tools/flags/generate_unexpire_flags.py.
  #include "build/chromeos_buildflags.h"
 --- /dev/null
-+++ chrome/browser/bromite_flag_choices.h
++++ b/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
@@ -25,7 +25,7 @@
 +#define CHROME_BROWSER_BROMITE_FLAG_CHOICES_H_
 +#endif  // CHROME_BROWSER_BROMITE_FLAG_CHOICES_H_
 --- /dev/null
-+++ chrome/browser/bromite_flag_entries.h
++++ b/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
@@ -35,7 +35,7 @@
 +#define CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
 +#endif  // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
 --- /dev/null
-+++ chrome/browser/ungoogled_flag_choices.h
++++ b/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
@@ -45,7 +45,7 @@
 +#define CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
 +#endif  // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
 --- /dev/null
-+++ chrome/browser/ungoogled_flag_entries.h
++++ b/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
@@ -55,7 +55,7 @@
 +#define CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 +#endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
 --- /dev/null
-+++ chrome/browser/ungoogled_platform_flag_choices.h
++++ b/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
@@ -65,7 +65,7 @@
 +#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
++++ b/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
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
index fab5b74..058119f 100644
--- 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
@@ -1,25 +1,25 @@
 # 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
+--- a/chrome/browser/media/router/discovery/dial/dial_registry.cc
++++ b/chrome/browser/media/router/discovery/dial/dial_registry.cc
+@@ -150,10 +150,6 @@ void DialRegistry::StartPeriodicDiscover
+     return;
  
    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
+   // Always send the current device list with the next discovery request.  This
+   // may not be necessary, but is done to match previous behavior.
+   ++registry_generation_;
+@@ -170,8 +166,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
index 2191bbe..44d5aca 100644
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/disable-download-quarantine.patch
+++ b/www/chromium-uc/patches/extra/ungoogled-chromium/disable-download-quarantine.patch
@@ -1,18 +1,18 @@
 # Disables file download quarantining
 
---- components/download/internal/common/base_file.cc.orig
-+++ components/download/internal/common/base_file.cc
-@@ -23,7 +23,6 @@
+--- a/components/download/internal/common/base_file.cc
++++ b/components/download/internal/common/base_file.cc
+@@ -22,7 +22,6 @@
  #include "components/download/public/common/download_interrupt_reasons_utils.h"
  #include "components/download/public/common/download_item.h"
  #include "components/download/public/common/download_stats.h"
 -#include "components/services/quarantine/quarantine.h"
  #include "crypto/secure_hash.h"
  
- #if defined(OS_WIN)
-@@ -535,105 +534,6 @@ DownloadInterruptReason BaseFile::Publis
+ #if BUILDFLAG(IS_ANDROID)
+@@ -525,102 +524,6 @@ DownloadInterruptReason BaseFile::Publis
  }
- #endif  // defined(OS_ANDROID)
+ #endif  // BUILDFLAG(IS_ANDROID)
  
 -namespace {
 -
@@ -102,27 +102,24 @@
 -
 -void BaseFile::OnQuarantineServiceError(const GURL& source_url,
 -                                        const GURL& referrer_url) {
--#if defined(OS_WIN)
--  if (base::FeatureList::IsEnabled(quarantine::kOutOfProcessQuarantine)) {
--    OnFileQuarantined(/*connection_error=*/true,
--                      quarantine::SetInternetZoneIdentifierDirectly(
--                          full_path_, source_url, referrer_url));
--    return;
--  }
--#endif  // defined(OS_WIN)
--
+-#if BUILDFLAG(IS_WIN)
+-  OnFileQuarantined(/*connection_error=*/true,
+-                    quarantine::SetInternetZoneIdentifierDirectly(
+-                        full_path_, source_url, referrer_url));
+-#else   // !BUILDFLAG(IS_WIN)
 -  CHECK(false) << "In-process quarantine service should not have failed.";
+-#endif  // !BUILDFLAG(IS_WIN)
 -}
  
  void BaseFile::AnnotateWithSourceInformation(
      const std::string& client_guid,
-@@ -641,32 +541,8 @@ void BaseFile::AnnotateWithSourceInforma
+@@ -628,32 +531,8 @@ void BaseFile::AnnotateWithSourceInforma
      const GURL& referrer_url,
      mojo::PendingRemote<quarantine::mojom::Quarantine> remote_quarantine,
      OnAnnotationDoneCallback on_annotation_done_callback) {
 -  GURL authority_url = GetEffectiveAuthorityURL(source_url, referrer_url);
 -  if (!remote_quarantine) {
--#if defined(OS_WIN)
+-#if BUILDFLAG(IS_WIN)
 -    quarantine::mojom::QuarantineFileResult result =
 -        quarantine::SetInternetZoneIdentifierDirectly(full_path_, authority_url,
 -                                                      referrer_url);
@@ -151,8 +148,8 @@
  }
  
  }  // namespace download
---- content/browser/BUILD.gn.orig
-+++ content/browser/BUILD.gn
+--- a/content/browser/BUILD.gn
++++ b/content/browser/BUILD.gn
 @@ -82,7 +82,6 @@ source_set("browser") {
      "//components/permissions:permissions_common",
      "//components/power_scheduler",
@@ -161,17 +158,17 @@
      "//components/services/storage",
      "//components/services/storage:filesystem_proxy_factory",
      "//components/services/storage/dom_storage:local_storage_proto",
---- content/browser/file_system_access/safe_move_helper.cc.orig
-+++ content/browser/file_system_access/safe_move_helper.cc
-@@ -12,7 +12,6 @@
- #include "base/task/thread_pool.h"
+--- a/content/browser/file_system_access/safe_move_helper.cc
++++ b/content/browser/file_system_access/safe_move_helper.cc
+@@ -13,7 +13,6 @@
  #include "base/threading/sequenced_task_runner_handle.h"
  #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
 -#include "components/services/quarantine/quarantine.h"
  #include "content/browser/file_system_access/file_system_access_error.h"
  #include "content/public/browser/content_browser_client.h"
  #include "content/public/common/content_client.h"
-@@ -193,20 +192,8 @@ void SafeMoveHelper::DidAfterWriteCheck(
+@@ -194,20 +193,8 @@ void SafeMoveHelper::DidAfterWriteCheck(
    // not exist anymore. In case of error, the source file URL will point to a
    // valid filesystem location.
    base::OnceCallback<void(base::File::Error)> result_callback;
@@ -190,9 +187,9 @@
                                       weak_factory_.GetWeakPtr());
 -  }
    manager_->DoFileSystemOperation(
-       FROM_HERE, &storage::FileSystemOperationRunner::MoveFileLocal,
-       std::move(result_callback), source_url(), dest_url(), option_);
-@@ -220,7 +207,6 @@ void SafeMoveHelper::DidFileSkipQuaranti
+       FROM_HERE, &storage::FileSystemOperationRunner::Move,
+       std::move(result_callback), source_url(), dest_url(), options_,
+@@ -223,7 +210,6 @@ void SafeMoveHelper::DidFileSkipQuaranti
  void SafeMoveHelper::DidFileDoQuarantine(
      const storage::FileSystemURL& target_url,
      const GURL& referrer_url,
@@ -200,7 +197,7 @@
      base::File::Error result) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
  
-@@ -251,37 +237,9 @@ void SafeMoveHelper::DidFileDoQuarantine
+@@ -254,37 +240,9 @@ void SafeMoveHelper::DidFileDoQuarantine
        referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS()
            ? referrer_url
            : GURL();
@@ -218,7 +215,7 @@
 -                           std::move(quarantine_remote)),
 -            quarantine::mojom::QuarantineFileResult::ANNOTATION_FAILED));
 -  } else {
--#if defined(OS_WIN)
+-#if BUILDFLAG(IS_WIN)
 -    base::ThreadPool::PostTaskAndReplyWithResult(
 -        FROM_HERE, {base::MayBlock()},
 -        base::BindOnce(&quarantine::SetInternetZoneIdentifierDirectly,
@@ -238,8 +235,8 @@
      quarantine::mojom::QuarantineFileResult result) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
  
---- content/browser/file_system_access/safe_move_helper.h.orig
-+++ content/browser/file_system_access/safe_move_helper.h
+--- a/content/browser/file_system_access/safe_move_helper.h
++++ b/content/browser/file_system_access/safe_move_helper.h
 @@ -58,10 +58,8 @@ class CONTENT_EXPORT SafeMoveHelper {
    void DidFileDoQuarantine(
        const storage::FileSystemURL& target_url,
@@ -251,13 +248,13 @@
        quarantine::mojom::QuarantineFileResult result);
  
    void ComputeHashForSourceFile(HashCallback callback);
---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig
-+++ content/browser/renderer_host/pepper/pepper_file_io_host.cc
+--- a/content/browser/renderer_host/pepper/pepper_file_io_host.cc
++++ b/content/browser/renderer_host/pepper/pepper_file_io_host.cc
 @@ -456,7 +456,7 @@ void PepperFileIOHost::OnLocalFileOpened
      ppapi::host::ReplyMessageContext reply_context,
      const base::FilePath& path,
      base::File::Error error_code) {
--#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if 0
    // Quarantining a file before its contents are available is only supported on
    // Windows and Linux.
@@ -266,15 +263,15 @@
  #endif
  }
  
--#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if 0
  void PepperFileIOHost::OnLocalFileQuarantined(
      ppapi::host::ReplyMessageContext reply_context,
      const base::FilePath& path,
---- content/browser/renderer_host/pepper/pepper_file_io_host.h.orig
-+++ content/browser/renderer_host/pepper/pepper_file_io_host.h
+--- a/content/browser/renderer_host/pepper/pepper_file_io_host.h
++++ b/content/browser/renderer_host/pepper/pepper_file_io_host.h
 @@ -13,7 +13,6 @@
- #include "base/macros.h"
+ #include "base/memory/raw_ptr.h"
  #include "base/memory/ref_counted.h"
  #include "base/memory/weak_ptr.h"
 -#include "components/services/quarantine/public/mojom/quarantine.mojom.h"
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
index f9f6449..35e5fd5 100644
--- 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
@@ -1,8 +1,8 @@
 # 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
+--- a/components/url_formatter/url_formatter.cc
++++ b/components/url_formatter/url_formatter.cc
+@@ -492,14 +492,14 @@ bool HasTwoViewSourceSchemes(base::Strin
  }  // namespace
  
  const FormatUrlType kFormatUrlOmitNothing = 0;
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
index f264b5d..bc2945b 100644
--- 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
@@ -1,8 +1,8 @@
 # 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
+--- a/chrome/browser/intranet_redirect_detector.cc
++++ b/chrome/browser/intranet_redirect_detector.cc
 @@ -119,9 +119,7 @@ void IntranetRedirectDetector::FinishSle
    simple_loaders_.clear();
    resulting_origins_.clear();
diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch
new file mode 100644
index 0000000..ea7e7a0
--- /dev/null
+++ b/www/chromium-uc/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch
@@ -0,0 +1,11 @@
+--- a/components/optimization_guide/core/optimization_guide_features.cc
++++ b/components/optimization_guide/core/optimization_guide_features.cc
+@@ -77,7 +77,7 @@ const base::Feature kOptimizationHintsFi
+ 
+ // Enables fetching from a remote Optimization Guide Service.
+ const base::Feature kRemoteOptimizationGuideFetching{
+-    "OptimizationHintsFetching", base::FEATURE_ENABLED_BY_DEFAULT};
++    "OptimizationHintsFetching", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kRemoteOptimizationGuideFetchingAnonymousDataConsent {
+   "OptimizationHintsFetchingAnonymousDataConsent",
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
index 2896a43..7372bf3 100644
--- 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
@@ -1,9 +1,9 @@
 # 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
+--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
++++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+@@ -3630,8 +3630,7 @@ ScriptValue WebGLRenderingContextBase::g
                pname, IdentifiabilityBenignStringToken(
                           String(ContextGL()->GetString(GL_RENDERER))));
          }
@@ -13,7 +13,7 @@
        }
        SynthesizeGLError(
            GL_INVALID_ENUM, "getParameter",
-@@ -3610,8 +3609,7 @@ ScriptValue WebGLRenderingContextBase::g
+@@ -3645,8 +3644,7 @@ ScriptValue WebGLRenderingContextBase::g
                pname, IdentifiabilityBenignStringToken(
                           String(ContextGL()->GetString(GL_VENDOR))));
          }
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
index 4ea4498..0d2a41f 100644
--- 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
@@ -1,8 +1,8 @@
 # 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
+--- a/third_party/blink/common/features.cc
++++ b/third_party/blink/common/features.cc
+@@ -468,7 +468,7 @@ const base::Feature kComputePressure{"Co
  // Prefetch request properties are updated to be privacy-preserving. See
  // crbug.com/988956.
  const base::Feature kPrefetchPrivacyChanges{"PrefetchPrivacyChanges",
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
index 5f87fc2..915b3be 100644
--- 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
@@ -1,8 +1,8 @@
 # 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
+--- a/chrome/browser/ui/views/toolbar/reload_button.cc
++++ b/chrome/browser/ui/views/toolbar/reload_button.cc
+@@ -83,7 +83,7 @@ bool ReloadButton::GetMenuEnabled() cons
  }
  
  void ReloadButton::SetMenuEnabled(bool enable) {
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
index a983beb..7d52d55 100644
--- 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
@@ -1,8 +1,8 @@
 # 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
+--- a/chrome/browser/ui/browser_commands.cc
++++ b/chrome/browser/ui/browser_commands.cc
+@@ -443,11 +443,6 @@ int GetContentRestrictions(const Browser
      CoreTabHelper* core_tab_helper =
          CoreTabHelper::FromWebContents(current_tab);
      content_restrictions = core_tab_helper->content_restrictions();
@@ -14,8 +14,8 @@
    }
    return content_restrictions;
  }
-@@ -1342,8 +1337,7 @@ bool CanSavePage(const Browser* browser)
-           prefs::kAllowFileSelectionDialogs)) {
+@@ -1371,8 +1366,7 @@ bool CanSavePage(const Browser* browser)
+       DownloadPrefs::DownloadRestriction::ALL_FILES) {
      return false;
    }
 -  return !browser->is_type_devtools() &&
@@ -24,8 +24,8 @@
  }
  
  void Print(Browser* browser) {
---- components/offline_pages/core/offline_page_model.cc.orig
-+++ components/offline_pages/core/offline_page_model.cc
+--- a/components/offline_pages/core/offline_page_model.cc
++++ b/components/offline_pages/core/offline_page_model.cc
 @@ -22,7 +22,7 @@ OfflinePageModel::SavePageParams::~SaveP
  
  // static
@@ -35,9 +35,9 @@
  }
  
  OfflinePageModel::OfflinePageModel() = default;
---- content/common/url_schemes.cc.orig
-+++ content/common/url_schemes.cc
-@@ -23,6 +23,9 @@ namespace {
+--- a/content/common/url_schemes.cc
++++ b/content/common/url_schemes.cc
+@@ -23,13 +23,22 @@ namespace {
  bool g_registered_url_schemes = false;
  
  const char* const kDefaultSavableSchemes[] = {
@@ -47,8 +47,7 @@
    url::kHttpScheme,
    url::kHttpsScheme,
    url::kFileScheme,
-@@ -30,7 +33,13 @@ const char* const kDefaultSavableSchemes
-   url::kFtpScheme,
+   url::kFileSystemScheme,
    kChromeDevToolsScheme,
    kChromeUIScheme,
 -  url::kDataScheme
@@ -62,9 +61,9 @@
  };
  
  // 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) {
+--- a/content/public/common/url_utils.cc
++++ b/content/public/common/url_utils.cc
+@@ -27,11 +27,7 @@ bool HasWebUIScheme(const GURL& url) {
  }
  
  bool IsSavableURL(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
index 6205679..fa93e8a 100644
--- 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
@@ -1,19 +1,19 @@
---- 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
+--- a/chrome/browser/ui/views/tabs/new_tab_button.cc
++++ b/chrome/browser/ui/views/tabs/new_tab_button.cc
+@@ -59,10 +59,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)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
    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
+--- a/chrome/browser/ui/views/tabs/tab_strip.cc
++++ b/chrome/browser/ui/views/tabs/tab_strip.cc
+@@ -2315,8 +2315,6 @@ void TabStrip::NewTabButtonPressed(const
  
      const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
      if (mouse.IsOnlyMiddleMouseButton()) {
@@ -22,7 +22,7 @@
          ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
          CHECK(clipboard);
          std::u16string clipboard_text;
-@@ -2689,7 +2687,6 @@ void TabStrip::NewTabButtonPressed(const
+@@ -2324,7 +2322,6 @@ void TabStrip::NewTabButtonPressed(const
                              /* data_dst = */ nullptr, &clipboard_text);
          if (!clipboard_text.empty())
            controller_->CreateNewTabWithLocation(clipboard_text);
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
index 6fb35ec..2b0ee0b 100644
--- 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
@@ -1,7 +1,7 @@
 # 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
+--- a/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc
++++ b/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc
 @@ -40,37 +40,22 @@ DnsSdDeviceLister::DnsSdDeviceLister(
  DnsSdDeviceLister::~DnsSdDeviceLister() {}
  
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
index 80a9618..3cd56cb 100644
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/fix-distilled-icons.patch
+++ b/www/chromium-uc/patches/extra/ungoogled-chromium/fix-distilled-icons.patch
@@ -1,5 +1,5 @@
---- components/dom_distiller/core/css/distilledpage.css.orig
-+++ components/dom_distiller/core/css/distilledpage.css
+--- a/components/dom_distiller/core/css/distilledpage.css
++++ b/components/dom_distiller/core/css/distilledpage.css
 @@ -28,6 +28,11 @@
    box-sizing: border-box;
  }
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
index 9f9df17..b6dbaad 100644
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/keep-expired-flags.patch
+++ b/www/chromium-uc/patches/extra/ungoogled-chromium/keep-expired-flags.patch
@@ -1,5 +1,5 @@
---- components/flags_ui/flags_state.cc.orig
-+++ components/flags_ui/flags_state.cc
+--- a/components/flags_ui/flags_state.cc
++++ b/components/flags_ui/flags_state.cc
 @@ -22,6 +22,7 @@
  #include "base/values.h"
  #include "build/build_config.h"
@@ -8,7 +8,7 @@
  #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(
+@@ -555,14 +556,18 @@ void FlagsState::GetFlagFeatureEntries(
    int current_platform = GetCurrentPlatform();
  
    for (const FeatureEntry& entry : feature_entries_) {
@@ -28,7 +28,7 @@
  
      base::Value supported_platforms(base::Value::Type::LIST);
      AddOsStrings(entry.supported_platforms, &supported_platforms);
-@@ -901,6 +906,7 @@ bool FlagsState::IsSupportedFeature(cons
+@@ -881,6 +886,7 @@ bool FlagsState::IsSupportedFeature(cons
      if (!entry.InternalNameMatches(name))
        continue;
      if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry))
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
index 58e1587..ef49d8b 100644
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch
+++ b/www/chromium-uc/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch
@@ -6,9 +6,9 @@
 # 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
+--- a/components/search_engines/template_url_prepopulate_data.cc
++++ b/components/search_engines/template_url_prepopulate_data.cc
+@@ -1331,6 +1331,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]));
@@ -18,8 +18,8 @@
    return t_urls;
  }
  
---- components/search_engines/util.cc.orig
-+++ components/search_engines/util.cc
+--- a/components/search_engines/util.cc
++++ b/components/search_engines/util.cc
 @@ -396,7 +396,7 @@ void GetSearchProvidersUsingLoadedEngine
  
    const int prepopulate_resource_keyword_version =
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
index 55ddd53..4ff54f2 100644
--- 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
@@ -1,12 +1,12 @@
 # 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[] = {
+--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
++++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
+@@ -59,7 +59,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)
+ #if BUILDFLAG(IS_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
index cbb86fd..90b3f4a 100644
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch
+++ b/www/chromium-uc/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch
@@ -18,8 +18,8 @@
 # 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
+--- a/chrome/browser/resources/extensions/item_list.html
++++ b/chrome/browser/resources/extensions/item_list.html
 @@ -80,13 +80,6 @@
  <div id="container">
    <managed-footnote hidden="[[filter]]"></managed-footnote>
@@ -34,9 +34,9 @@
      <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 @@
+--- a/chrome/browser/resources/extensions/sidebar.html
++++ b/chrome/browser/resources/extensions/sidebar.html
+@@ -76,12 +76,3 @@
      <paper-ripple></paper-ripple>
    </a>
  </iron-selector>
@@ -49,9 +49,9 @@
 -    <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 @@
+--- a/chrome/browser/resources/history/side_bar.html
++++ b/chrome/browser/resources/history/side_bar.html
+@@ -120,13 +120,6 @@
            $i18n{historyMenuItem}
            <paper-ripple></paper-ripple>
          </a>
@@ -62,11 +62,11 @@
 -          $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
+             href="chrome://settings/clearBrowserData"
+--- a/chrome/browser/resources/ntp4/incognito_tab.html
++++ b/chrome/browser/resources/ntp4/incognito_tab.html
 @@ -24,8 +24,6 @@ document.querySelector('#incognitothemec
    <h1>$i18n{incognitoTabHeading}</h1>
    <p id="subtitle">
@@ -76,8 +76,8 @@
    </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
+--- a/chrome/browser/resources/settings/a11y_page/a11y_page.html
++++ b/chrome/browser/resources/settings/a11y_page/a11y_page.html
 @@ -21,7 +21,7 @@
                external$="[[captionSettingsOpensExternally_]]">
            </cr-link-row>
@@ -88,9 +88,9 @@
                label="$i18n{captionsTitle}"
                on-click="onCaptionsClick_"
 @@ -51,10 +51,6 @@
+             label="$i18n{accessibleImageLabelsTitle}"
              sub-label="$i18n{accessibleImageLabelsSubtitle}">
          </settings-toggle-button>
- </if>
 -        <cr-link-row class="hr" label="$i18n{moreFeaturesLink}"
 -            on-click="onMoreFeaturesLinkClick_" sub-label="$i18n{a11yWebStore}"
 -            external>
@@ -98,8 +98,8 @@
        </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
+--- a/chrome/browser/resources/settings/about_page/about_page.html
++++ b/chrome/browser/resources/settings/about_page/about_page.html
 @@ -131,8 +131,6 @@
          </div>
        </template>
@@ -109,8 +109,8 @@
  <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
+--- a/chrome/browser/resources/settings/appearance_page/appearance_page.html
++++ b/chrome/browser/resources/settings/appearance_page/appearance_page.html
 @@ -22,11 +22,11 @@
      <settings-animated-pages id="pages" section="appearance"
          focus-config="[[focusConfig_]]">
@@ -124,20 +124,20 @@
 +          <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">
+ <if expr="not is_linux or chromeos_ash or chromeos_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>
+--- a/chrome/browser/resources/settings/autofill_page/passwords_section.html
++++ b/chrome/browser/resources/settings/autofill_page/passwords_section.html
+@@ -102,6 +102,7 @@
+         label="$i18n{passwordsAutosigninLabel}"
+         sub-label="$i18n{passwordsAutosigninDescription}">
+     </settings-toggle-button>
 +<if expr="false">
      <div id="checkPasswordsBannerContainer" class="cr-row"
          hidden$="[[!shouldShowBanner_]]">
        <picture>
-@@ -155,6 +156,7 @@
+@@ -156,6 +157,7 @@
        <!-- This div lays out the link correctly, relative to the text. -->
        <div class="cr-padded-text">$i18nRaw{managePasswordsLabel}</div>
      </div>
@@ -145,58 +145,60 @@
      <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
+--- a/chrome/browser/resources/settings/autofill_page/payments_section.html
++++ b/chrome/browser/resources/settings/autofill_page/payments_section.html
 @@ -53,11 +53,6 @@
-       </div>
-     </template>
+   </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 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>
+ <div class="cr-row continuation">
+   <h2 class="flex">$i18n{creditCards}</h2>
+   <cr-button id="addCreditCard" class="header-aligned-button"
+--- a/chrome/browser/resources/settings/basic_page/basic_page.html
++++ b/chrome/browser/resources/settings/basic_page/basic_page.html
+@@ -59,7 +59,7 @@
+               prefs="{{prefs}}">
+           </settings-privacy-guide-promo>
+         </settings-section>
 -        <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;
+--- a/chrome/browser/resources/settings/privacy_page/personalization_options.html
++++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html
+@@ -13,7 +13,7 @@
+         padding-inline-start: 0;
        }
      </style>
--<if expr="not chromeos">
+-<if expr="not chromeos and not lacros">
 +<if expr="false">
+     <!-- Signout is not supported yet on lacros, https://crbug.com/1217645 -->
      <settings-toggle-button id="signinAllowedToggle"
          class="hr"
-         hidden="[[!signinAvailable_]]"
-@@ -51,12 +51,6 @@
+@@ -70,14 +70,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>
+-    <template is="dom-if" if="[[showUrlCollectionToggle_()]]" restamp>
+-      <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>
+-    </template>
  <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 @@
+--- a/chrome/browser/resources/settings/privacy_page/security_page.html
++++ b/chrome/browser/resources/settings/privacy_page/security_page.html
+@@ -107,10 +107,3 @@
          sub-label="$i18n{manageCertificatesDescription}"
          on-click="onManageCertificatesClick_"></cr-link-row>
  </if>
@@ -207,8 +209,8 @@
 -        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
+--- a/chrome/browser/resources/settings/search_page/search_page.html
++++ b/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">
@@ -220,19 +222,8 @@
        </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
+--- a/chrome/browser/resources/settings/settings_page/settings_subpage.html
++++ b/chrome/browser/resources/settings/settings_page/settings_subpage.html
 @@ -72,7 +72,7 @@
        </template>
        <h1 class="cr-title-text">[[pageTitle]]</h1>
@@ -242,9 +233,9 @@
          <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() {
+--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
++++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
+@@ -175,6 +175,7 @@ void ProfileMenuView::BuildMenu() {
  }
  
  gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
@@ -252,7 +243,7 @@
    Profile* profile = browser()->profile();
    if (profile->IsOffTheRecord() || profile->IsGuestSession())
      return gfx::ImageSkia();
-@@ -450,8 +451,7 @@ void ProfileMenuView::BuildIdentity() {
+@@ -456,8 +457,7 @@ void ProfileMenuView::BuildIdentity() {
          menu_subtitle_);
    } else {
      menu_title_ = std::u16string();
@@ -262,21 +253,19 @@
      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()));
+--- a/chrome/browser/ui/views/sad_tab_view.cc
++++ b/chrome/browser/ui/views/sad_tab_view.cc
+@@ -549,13 +549,6 @@ SadTabView::SadTabView(content::WebConte
+   auto* actions_container =
+       container->AddChildView(std::make_unique<views::FlexLayoutView>());
+   actions_container->SetCrossAxisAlignment(views::LayoutAlignment::kCenter);
+-  auto* help_link =
+-      actions_container->AddChildView(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),
+-  help_link->SetProperty(views::kTableVertAlignKey,
+-                         views::LayoutAlignment::kCenter);
+   action_button_ =
+       actions_container->AddChildView(std::make_unique<views::MdTextButton>(
+           base::BindRepeating(&SadTabView::PerformAction,