Browse Source

patches/extra: Update for 75.0.3770.80

xsmile 4 years ago
parent
commit
949f69ac47
29 changed files with 141 additions and 132 deletions
  1. 22 22
      patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
  2. 9 9
      patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
  3. 6 6
      patches/extra/bromite/flag-max-connections-per-host.patch
  4. 1 1
      patches/extra/debian_buster/disable/android.patch
  5. 8 5
      patches/extra/debian_buster/disable/fuzzers.patch
  6. 1 1
      patches/extra/debian_buster/disable/google-api-warning.patch
  7. 1 1
      patches/extra/debian_buster/disable/welcome-page.patch
  8. 13 13
      patches/extra/inox-patchset/0006-modify-default-prefs.patch
  9. 11 10
      patches/extra/inox-patchset/0008-restore-classic-ntp.patch
  10. 1 1
      patches/extra/inox-patchset/chromium-widevine.patch
  11. 1 1
      patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
  12. 1 1
      patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch
  13. 1 1
      patches/extra/iridium-browser/updater-disable-auto-update.patch
  14. 11 11
      patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
  15. 3 3
      patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch
  16. 2 2
      patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch
  17. 1 1
      patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch
  18. 2 2
      patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch
  19. 13 8
      patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch
  20. 2 2
      patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch
  21. 9 9
      patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
  22. 3 3
      patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
  23. 4 4
      patches/extra/ungoogled-chromium/default-to-https-scheme.patch
  24. 1 1
      patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch
  25. 1 1
      patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch
  26. 7 7
      patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch
  27. 4 4
      patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch
  28. 1 1
      patches/extra/ungoogled-chromium/popups-to-tabs.patch
  29. 1 1
      patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch

+ 22 - 22
patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch

@@ -9,7 +9,7 @@
 
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -130,6 +130,7 @@
+@@ -134,6 +134,7 @@
  #include "third_party/blink/public/common/experiments/memory_ablation_experiment.h"
  #include "third_party/blink/public/common/features.h"
  #include "third_party/leveldatabase/leveldb_features.h"
@@ -17,7 +17,7 @@
  #include "ui/accessibility/accessibility_switches.h"
  #include "ui/base/ui_base_features.h"
  #include "ui/base/ui_base_switches.h"
-@@ -1128,6 +1129,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1082,6 +1083,14 @@ const FeatureEntry kFeatureEntries[] = {
       "Force punycode hostnames",
       "Force punycode in hostnames instead of Unicode when displaying Internationalized Domain Names (IDNs).",
       kOsAll, SINGLE_VALUE_TYPE("force-punycode-hostnames")},
@@ -42,7 +42,7 @@
  #include "ui/events/blink/blink_features.h"
  #include "ui/gfx/switches.h"
  #include "ui/gl/gl_switches.h"
-@@ -438,6 +439,11 @@ void SetIndividualRuntimeFeatures(
+@@ -431,6 +432,11 @@ void SetIndividualRuntimeFeatures(
      WebRuntimeFeatures::EnableForbidSyncXHRInPageDismissal(true);
    }
  
@@ -64,7 +64,7 @@
  #include "cc/input/overscroll_behavior.h"
  #include "cc/input/scroll_snap_data.h"
  #include "services/metrics/public/cpp/mojo_ukm_recorder.h"
-@@ -774,6 +775,15 @@ Document::Document(const DocumentInit& i
+@@ -768,6 +769,15 @@ Document::Document(const DocumentInit& i
  #ifndef NDEBUG
    liveDocumentSet().insert(this);
  #endif
@@ -80,7 +80,7 @@
  }
  
  Document::~Document() {
-@@ -800,6 +810,14 @@ Range* Document::CreateRangeAdjustedToTr
+@@ -794,6 +804,14 @@ Range* Document::CreateRangeAdjustedToTr
                         Position::BeforeNode(*shadow_host));
  }
  
@@ -97,7 +97,7 @@
      selector_query_cache_ = std::make_unique<SelectorQueryCache>();
 --- a/third_party/blink/renderer/core/dom/document.h
 +++ b/third_party/blink/renderer/core/dom/document.h
-@@ -393,6 +393,10 @@ class CORE_EXPORT Document : public Cont
+@@ -392,6 +392,10 @@ class CORE_EXPORT Document : public Cont
      has_xml_declaration_ = has_xml_declaration ? 1 : 0;
    }
  
@@ -108,19 +108,19 @@
    String visibilityState() const;
    bool IsPageVisible() const;
    bool hidden() const;
-@@ -1815,6 +1819,9 @@ class CORE_EXPORT Document : public Cont
+@@ -1827,6 +1831,9 @@ class CORE_EXPORT Document : public Cont
  
    double start_time_;
  
 +  double noise_factor_x_;
 +  double noise_factor_y_;
 +
-   TraceWrapperMember<ScriptRunner> script_runner_;
+   Member<ScriptRunner> script_runner_;
  
    HeapVector<Member<ScriptElementBase>> current_script_stack_;
 --- a/third_party/blink/renderer/core/dom/element.cc
 +++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -1222,6 +1222,11 @@ DOMRectList* Element::getClientRects() {
+@@ -1321,6 +1321,11 @@ DOMRectList* Element::getClientRects() {
    DCHECK(element_layout_object);
    GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
        quads, *element_layout_object);
@@ -132,7 +132,7 @@
    return DOMRectList::Create(quads);
  }
  
-@@ -1239,6 +1244,9 @@ DOMRect* Element::getBoundingClientRect(
+@@ -1338,6 +1343,9 @@ DOMRect* Element::getBoundingClientRect(
    DCHECK(element_layout_object);
    GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
                                                          *element_layout_object);
@@ -144,7 +144,7 @@
  
 --- a/third_party/blink/renderer/core/dom/range.cc
 +++ b/third_party/blink/renderer/core/dom/range.cc
-@@ -1642,11 +1642,21 @@ DOMRectList* Range::getClientRects() con
+@@ -1643,11 +1643,21 @@ DOMRectList* Range::getClientRects() con
    Vector<FloatQuad> quads;
    GetBorderAndTextQuads(quads);
  
@@ -169,7 +169,7 @@
  // TODO(editing-dev): We should make
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -549,6 +549,12 @@
+@@ -573,6 +573,12 @@
        settable_from_internals: true,
      },
      {
@@ -184,8 +184,8 @@
      },
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -651,4 +651,12 @@ void WebRuntimeFeatures::EnableHTMLImpor
-   RuntimeEnabledFeatures::SetHTMLImportsOnlyChromeEnabled(enable);
+@@ -668,4 +668,12 @@ void WebRuntimeFeatures::EnableSkipTouch
+   RuntimeEnabledFeatures::SetSkipTouchEventFilterEnabled(enable);
  }
  
 +void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) {
@@ -199,7 +199,7 @@
  }  // namespace blink
 --- a/third_party/blink/public/platform/web_runtime_features.h
 +++ b/third_party/blink/public/platform/web_runtime_features.h
-@@ -230,6 +230,8 @@ class WebRuntimeFeatures {
+@@ -232,6 +232,8 @@ class WebRuntimeFeatures {
    BLINK_PLATFORM_EXPORT static void EnableMergeBlockingNonBlockingPools(bool);
    BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
    BLINK_PLATFORM_EXPORT static void EnableForbidSyncXHRInPageDismissal(bool);
@@ -210,7 +210,7 @@
    BLINK_PLATFORM_EXPORT static void EnableHTMLImports(bool);
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2073,6 +2073,7 @@ jumbo_split_static_library("browser") {
+@@ -2075,6 +2075,7 @@ jumbo_split_static_library("browser") {
      "//third_party/metrics_proto",
      "//third_party/re2",
      "//third_party/smhasher:cityhash",
@@ -220,7 +220,7 @@
      "//third_party/widevine/cdm:buildflags",
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -188,6 +188,7 @@ jumbo_source_set("browser") {
+@@ -192,6 +192,7 @@ jumbo_source_set("browser") {
      "//third_party/libyuv",
      "//third_party/re2",
      "//third_party/sqlite",
@@ -230,15 +230,15 @@
      "//third_party/zlib",
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -215,6 +215,7 @@
+@@ -214,6 +214,7 @@
  #include "third_party/blink/public/common/page/launching_process_state.h"
  #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
  #include "third_party/blink/public/public_buildflags.h"
 +#include "third_party/ungoogled/ungoogled_switches.h"
  #include "third_party/skia/include/core/SkBitmap.h"
+ #include "ui/accessibility/accessibility_switches.h"
  #include "ui/base/ui_base_features.h"
- #include "ui/base/ui_base_switches.h"
-@@ -3020,6 +3021,8 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3003,6 +3004,8 @@ void RenderProcessHostImpl::PropagateBro
      switches::kEnableWebGLImageChromium,
      switches::kEnableWebVR,
      switches::kFileUrlPathAlias,
@@ -249,7 +249,7 @@
      switches::kForceGpuMemAvailableMb,
 --- a/content/child/BUILD.gn
 +++ b/content/child/BUILD.gn
-@@ -119,6 +119,7 @@ target(link_target_type, "child") {
+@@ -117,6 +117,7 @@ target(link_target_type, "child") {
      "//third_party/blink/public:scaled_resources",
      "//third_party/blink/public/common",
      "//third_party/ced",
@@ -259,7 +259,7 @@
      "//ui/events/blink",
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1454,6 +1454,7 @@ jumbo_component("platform") {
+@@ -1467,6 +1467,7 @@ jumbo_component("platform") {
      "//third_party/ced",
      "//third_party/emoji-segmenter",
      "//third_party/icu",

+ 9 - 9
patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch

@@ -67,10 +67,10 @@ approach to change color components.
  #include "third_party/skia/include/core/SkSurface.h"
  #include "third_party/skia/include/gpu/GrContext.h"
 +#include "third_party/skia/include/private/SkColorData.h"
+ #include "v8/include/v8.h"
  
  namespace blink {
- 
-@@ -151,10 +155,165 @@ bool StaticBitmapImage::ConvertToArrayBu
+@@ -152,10 +156,165 @@ bool StaticBitmapImage::ConvertToArrayBu
    DCHECK(read_pixels_successful ||
           !sk_image->bounds().intersect(SkIRect::MakeXYWH(
               rect.X(), rect.Y(), info.width(), info.height())));
@@ -249,7 +249,7 @@ approach to change color components.
    // Methods overridden by all sub-classes
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1142,6 +1142,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1096,6 +1096,10 @@ const FeatureEntry kFeatureEntries[] = {
       "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.",
       kOsAll, SINGLE_VALUE_TYPE(switches::kFingerprintingCanvasMeasureTextNoise)},
@@ -262,7 +262,7 @@ approach to change color components.
       SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -443,6 +443,8 @@ void SetIndividualRuntimeFeatures(
+@@ -436,6 +436,8 @@ void SetIndividualRuntimeFeatures(
        command_line.HasSwitch(switches::kFingerprintingClientRectsNoise));
    WebRuntimeFeatures::EnableFingerprintingCanvasMeasureTextNoise(
        command_line.HasSwitch(switches::kFingerprintingCanvasMeasureTextNoise));
@@ -273,7 +273,7 @@ approach to change color components.
        base::FeatureList::IsEnabled(media::kAutoplayIgnoreWebAudio));
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -555,6 +555,9 @@
+@@ -579,6 +579,9 @@
        name: "FingerprintingCanvasMeasureTextNoise",
      },
      {
@@ -285,7 +285,7 @@ approach to change color components.
      },
 --- 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,8 @@ void WebRuntimeFeatures::EnableFingerpri
+@@ -676,4 +676,8 @@ void WebRuntimeFeatures::EnableFingerpri
    RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
  }
  
@@ -296,7 +296,7 @@ approach to change color components.
  }  // namespace blink
 --- a/third_party/blink/public/platform/web_runtime_features.h
 +++ b/third_party/blink/public/platform/web_runtime_features.h
-@@ -232,6 +232,7 @@ class WebRuntimeFeatures {
+@@ -234,6 +234,7 @@ class WebRuntimeFeatures {
    BLINK_PLATFORM_EXPORT static void EnableForbidSyncXHRInPageDismissal(bool);
    BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
    BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
@@ -306,7 +306,7 @@ approach to change color components.
    BLINK_PLATFORM_EXPORT static void EnableHTMLImports(bool);
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -3023,6 +3023,7 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3006,6 +3006,7 @@ void RenderProcessHostImpl::PropagateBro
      switches::kFileUrlPathAlias,
      switches::kFingerprintingClientRectsNoise,
      switches::kFingerprintingCanvasMeasureTextNoise,
@@ -316,7 +316,7 @@ approach to change color components.
      switches::kForceGpuMemAvailableMb,
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1423,7 +1423,9 @@ jumbo_component("platform") {
+@@ -1435,7 +1435,9 @@ jumbo_component("platform") {
      "//third_party/blink/renderer:non_test_config",
    ]
  

+ 6 - 6
patches/extra/bromite/flag-max-connections-per-host.patch

@@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default.
 
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -766,6 +766,11 @@ const FeatureEntry::Choice kForceEffecti
+@@ -678,6 +678,11 @@ const FeatureEntry::Choice kForceEffecti
       net::kEffectiveConnectionType4G},
  };
  
@@ -29,7 +29,7 @@ with limited CPU/memory resources and it is disabled by default.
  // Ensure that all effective connection types returned by Network Quality
  // Estimator (NQE) are also exposed via flags.
  static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 ==
-@@ -2176,6 +2181,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2055,6 +2060,9 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kAutofillCreditCardUploadDescription, kOsAll,
       FEATURE_VALUE_TYPE(autofill::features::kAutofillUpstream)},
  #endif  // TOOLKIT_VIEWS || OS_ANDROID
@@ -41,7 +41,7 @@ with limited CPU/memory resources and it is disabled by default.
       flag_descriptions::kSafeSearchUrlReportingDescription, kOsAll,
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1232,6 +1232,10 @@ const char kLookalikeUrlNavigationSugges
+@@ -1260,6 +1260,10 @@ const char kLookalikeUrlNavigationSugges
  const char kMarkHttpAsName[] = "Mark non-secure origins as non-secure";
  const char kMarkHttpAsDescription[] = "Change the UI treatment for HTTP pages";
  
@@ -54,7 +54,7 @@ with limited CPU/memory resources and it is disabled by default.
  const char kMediaRouterCastAllowAllIPsDescription[] =
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -739,6 +739,9 @@ extern const char kMarkHttpAsWarning[];
+@@ -770,6 +770,9 @@ extern const char kMarkHttpAsWarning[];
  extern const char kMarkHttpAsWarningAndDangerousOnFormEdits[];
  extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
  
@@ -119,7 +119,7 @@ with limited CPU/memory resources and it is disabled by default.
  #include "base/synchronization/waitable_event.h"
  #include "base/task/post_task.h"
  #include "base/task/task_traits.h"
-@@ -98,6 +100,7 @@
+@@ -101,6 +103,7 @@
  #include "components/metrics_services_manager/metrics_services_manager.h"
  #include "components/metrics_services_manager/metrics_services_manager_client.h"
  #include "components/net_log/chrome_net_log.h"
@@ -127,7 +127,7 @@ with limited CPU/memory resources and it is disabled by default.
  #include "components/network_time/network_time_tracker.h"
  #include "components/optimization_guide/optimization_guide_service.h"
  #include "components/policy/core/common/policy_service.h"
-@@ -310,6 +313,18 @@ void BrowserProcessImpl::Init() {
+@@ -323,6 +326,18 @@ void BrowserProcessImpl::Init() {
                               base::Bind(&ApplyMetricsReportingPolicy));
  #endif
  

+ 1 - 1
patches/extra/debian_buster/disable/android.patch

@@ -13,7 +13,7 @@ author: Michael Gilbert <mgilbert@debian.org>
    enable_gvr_services = is_android && !is_chromecast &&
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -373,7 +373,7 @@ group("gn_all") {
+@@ -371,7 +371,7 @@ group("gn_all") {
    #       seems currently broken for this platform at the moment, and the
    #       corresponding code build and works on Linux unmodified.
    #       See instructions in the corresponding BUILD.gn.

+ 8 - 5
patches/extra/debian_buster/disable/fuzzers.patch

@@ -7,24 +7,27 @@ author: Michael Gilbert <mgilbert@debian.org>
      }
    }
  
--  if ((is_linux && !is_chromecast) ||
--      (is_win && (use_drfuzz || use_libfuzzer)) || (use_libfuzzer && is_mac)) {
+-  if ((is_linux && !is_chromecast) || (is_win && use_libfuzzer) ||
+-      (use_libfuzzer && is_mac)) {
 +  if (false) {
      deps += [
        "//chrome/services/cups_ipp_parser/public/cpp:fuzzers",
        "//testing/libfuzzer/fuzzers",
 --- a/content/test/BUILD.gn
 +++ b/content/test/BUILD.gn
-@@ -2287,9 +2287,3 @@ test("content_perftests") {
-     deps += [ "//testing/android/native_test:native_test_native_code" ]
+@@ -2320,12 +2320,6 @@ test("content_perftests") {
    }
  }
--
+ 
 -group("fuzzers") {
 -  deps = [
 -    "//content/test/fuzzer",
 -  ]
 -}
+-
+ # This group defines the isolate files needed to run
+ # test_buildbucket_api_gpu_cases.py on bots. This also tells the build system
+ # when the tests should be re-run - when one of the dependent files changes.
 --- a/v8/tools/BUILD.gn
 +++ b/v8/tools/BUILD.gn
 @@ -11,7 +11,6 @@ group("gn_all") {

+ 1 - 1
patches/extra/debian_buster/disable/google-api-warning.patch

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
 
 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -807,10 +807,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -810,10 +810,6 @@ void StartupBrowserCreatorImpl::AddInfoB
      chrome::ShowBadFlagsPrompt(web_contents);
      InfoBarService* infobar_service =
          InfoBarService::FromWebContents(web_contents);

+ 1 - 1
patches/extra/debian_buster/disable/welcome-page.patch

@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/857767
 
 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
-@@ -1073,7 +1073,7 @@ void ProfileManager::InitProfileUserPref
+@@ -1072,7 +1072,7 @@ void ProfileManager::InitProfileUserPref
      profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
                                     supervised_user_id);
    }

+ 13 - 13
patches/extra/inox-patchset/0006-modify-default-prefs.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1098,7 +1098,7 @@ void ChromeContentBrowserClient::Registe
+@@ -1125,7 +1125,7 @@ void ChromeContentBrowserClient::Registe
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -11,7 +11,7 @@
    // user policy in addition to the same named ones in Local State (which are
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -68,11 +68,11 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -66,11 +66,11 @@ void RegisterBrowserUserPrefs(user_prefs
    registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
    registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
    registry->RegisterBooleanPref(
@@ -71,20 +71,20 @@
  
 --- a/chrome/browser/ui/navigation_correction_tab_observer.cc
 +++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
-@@ -57,7 +57,7 @@ NavigationCorrectionTabObserver::~Naviga
+@@ -55,7 +55,7 @@ NavigationCorrectionTabObserver::~Naviga
+ // static
  void NavigationCorrectionTabObserver::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* prefs) {
-   prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
--                             true,
-+                             false,
+-  prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true,
++  prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, false,
                               user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
  }
  
 --- a/components/autofill/core/common/autofill_prefs.cc
 +++ b/components/autofill/core/common/autofill_prefs.cc
-@@ -137,10 +137,10 @@ void RegisterProfilePrefs(user_prefs::Pr
-       prefs::kAutofillBillingCustomerNumber, 0.0,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
+@@ -130,10 +130,10 @@ const char kAutocompleteLastVersionReten
+ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+   // Synced prefs. Used for cross-device choices, e.g., credit card Autofill.
    registry->RegisterBooleanPref(
 -      prefs::kAutofillEnabledDeprecated, true,
 +      prefs::kAutofillEnabledDeprecated, false,
@@ -95,7 +95,7 @@
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
    registry->RegisterIntegerPref(
        prefs::kAutofillLastVersionDeduped, 0,
-@@ -153,7 +153,7 @@ void RegisterProfilePrefs(user_prefs::Pr
+@@ -146,7 +146,7 @@ void RegisterProfilePrefs(user_prefs::Pr
        prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
    registry->RegisterBooleanPref(
@@ -145,7 +145,7 @@
        prefs::kShowManagedBookmarksInBookmarkBar,
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -139,7 +139,7 @@ const char Profile::kProfileKey[] = "__P
+@@ -148,7 +148,7 @@ const char Profile::kProfileKey[] = "__P
  void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kSearchSuggestEnabled,
@@ -180,7 +180,7 @@
  }
 --- a/extensions/common/extension.cc
 +++ b/extensions/common/extension.cc
-@@ -367,14 +367,6 @@ bool Extension::ShouldDisplayInExtension
+@@ -382,14 +382,6 @@ bool Extension::ShouldDisplayInExtension
    if (is_theme())
      return false;
  
@@ -211,7 +211,7 @@
                                  false);
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -333,10 +333,10 @@ void RecordParsingOnSavingDifference(
+@@ -354,10 +354,10 @@ bool IsOnlyNewParserEnabled() {
  void PasswordManager::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(

+ 11 - 10
patches/extra/inox-patchset/0008-restore-classic-ntp.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/search/search.cc
 +++ b/chrome/browser/search/search.cc
-@@ -190,29 +190,7 @@ struct NewTabURLDetails {
+@@ -196,29 +196,7 @@ struct NewTabURLDetails {
  
      const GURL local_url(chrome::kChromeSearchLocalNtpUrl);
  
@@ -33,20 +33,21 @@
    const GURL url;
 --- a/components/ntp_snippets/features.cc
 +++ b/components/ntp_snippets/features.cc
-@@ -34,13 +34,13 @@ const base::Feature* const kAllFeatures[
+@@ -41,7 +41,7 @@ const base::Feature* const kAllFeatures[
      &kRemoteSuggestionsBackendFeature};
  
  const base::Feature kArticleSuggestionsFeature{
 -    "NTPArticleSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
 +    "NTPArticleSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
  
- const base::Feature kBookmarkSuggestionsFeature{
--    "NTPBookmarkSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "NTPBookmarkSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+ const base::Feature kRemoteSuggestionsEmulateM58FetchingSchedule{
+     "RemoteSuggestionsEmulateM58FetchingSchedule",
+@@ -71,7 +71,7 @@ const char kNotificationsDailyLimit[] =
+ const char kNotificationsIgnoredLimitParam[] = "ignored_limit";
  
- const base::Feature kIncreasedVisibility{"NTPSnippetsIncreasedVisibility",
--                                         base::FEATURE_ENABLED_BY_DEFAULT};
-+                                         base::FEATURE_DISABLED_BY_DEFAULT};
+ const base::Feature kKeepPrefetchedContentSuggestions{
+-    "KeepPrefetchedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
++    "KeepPrefetchedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
  
- const base::Feature kBreakingNewsPushFeature{"BreakingNewsPush",
-                                              base::FEATURE_DISABLED_BY_DEFAULT};
+ const base::Feature kContentSuggestionsDebugLog{
+     "ContentSuggestionsDebugLog", base::FEATURE_DISABLED_BY_DEFAULT};

+ 1 - 1
patches/extra/inox-patchset/chromium-widevine.patch

@@ -1,6 +1,6 @@
 --- a/chrome/common/chrome_content_client.cc
 +++ b/chrome/common/chrome_content_client.cc
-@@ -98,7 +98,7 @@
+@@ -97,7 +97,7 @@
  // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is
  // bundled and not a component. When the Widevine CDM is a component, it is
  // registered in widevine_cdm_component_installer.cc.

+ 1 - 1
patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch

@@ -9,7 +9,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run
 
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -1555,8 +1555,6 @@ int ChromeBrowserMainParts::PreMainMessa
+@@ -1542,8 +1542,6 @@ int ChromeBrowserMainParts::PreMainMessa
    // and preferences have been registered since some of the import code depends
    // on preferences.
    if (first_run::IsChromeFirstRun()) {

+ 1 - 1
patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch

@@ -29,7 +29,7 @@ TLDR: Do not let files sneak onto the disk too easily.
 
 --- a/chrome/browser/download/download_prefs.cc
 +++ b/chrome/browser/download/download_prefs.cc
-@@ -230,7 +230,7 @@ void DownloadPrefs::RegisterProfilePrefs
+@@ -235,7 +235,7 @@ void DownloadPrefs::RegisterProfilePrefs
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kPromptForDownload,

+ 1 - 1
patches/extra/iridium-browser/updater-disable-auto-update.patch

@@ -16,7 +16,7 @@ the case anyway, since we are based off Chromium, not Chrome.
 
 --- a/chrome/browser/app_controller_mac.mm
 +++ b/chrome/browser/app_controller_mac.mm
-@@ -663,7 +663,7 @@ static base::mac::ScopedObjCClassSwizzle
+@@ -674,7 +674,7 @@ static base::mac::ScopedObjCClassSwizzle
    CFStringRef checkInterval = CFSTR("checkInterval");
    CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
    if (!plist) {

+ 11 - 11
patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1097,6 +1097,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1051,6 +1051,10 @@ const FeatureEntry kFeatureEntries[] = {
       "Enable stacking in tab strip",
       "Forces tabs to be stacked in the tab strip. Otherwise, they follow default behavior.",
       kOsAll, SINGLE_VALUE_TYPE("enable-stacked-tab-strip")},
@@ -27,7 +27,7 @@
    if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection))
      SetClientSidePhishingDetection(true);
  #endif
-@@ -338,14 +339,16 @@ void ChromeRenderFrameObserver::DidFinis
+@@ -337,14 +338,16 @@ void ChromeRenderFrameObserver::DidFinis
    if (frame->Parent())
      return;
  
@@ -71,8 +71,8 @@
 +#include "base/command_line.h"
  #include "base/debug/crash_logging.h"
  #include "base/format_macros.h"
- #include "base/guid.h"
-@@ -197,6 +198,12 @@ bool IsCreatedByExtension(const Template
+ #include "base/metrics/histogram_macros.h"
+@@ -196,6 +197,12 @@ bool IsCreatedByExtension(const Template
           template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION;
  }
  
@@ -85,7 +85,7 @@
  }  // namespace
  
  // TemplateURLService::LessWithPrefix -----------------------------------------
-@@ -283,6 +290,7 @@ TemplateURLService::TemplateURLService(
+@@ -282,6 +289,7 @@ TemplateURLService::TemplateURLService(
      rappor::RapporServiceImpl* rappor_service,
      const base::Closure& dsp_change_callback)
      : prefs_(prefs),
@@ -93,7 +93,7 @@
        search_terms_data_(std::move(search_terms_data)),
        web_data_service_(web_data_service),
        client_(std::move(client)),
-@@ -338,7 +346,7 @@ bool TemplateURLService::CanAddAutogener
+@@ -337,7 +345,7 @@ bool TemplateURLService::CanAddAutogener
    if (existing_url) {
      // We already have a TemplateURL for this keyword. Only allow it to be
      // replaced if the TemplateURL can be replaced.
@@ -102,7 +102,7 @@
    }
  
    // We don't have a TemplateURL with keyword.  We still may not allow this
-@@ -347,8 +355,8 @@ bool TemplateURLService::CanAddAutogener
+@@ -346,8 +354,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.
@@ -113,7 +113,7 @@
  }
  
  bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
-@@ -1357,6 +1365,8 @@ SyncDataMap TemplateURLService::CreateGU
+@@ -1369,6 +1377,8 @@ SyncDataMap TemplateURLService::CreateGU
  
  void TemplateURLService::Init(const Initializer* initializers,
                                int num_initializers) {
@@ -122,7 +122,7 @@
    if (client_)
      client_->SetOwner(this);
  
-@@ -1589,6 +1599,9 @@ void TemplateURLService::ChangeToLoadedS
+@@ -1604,6 +1614,9 @@ void TemplateURLService::ChangeToLoadedS
  
  bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
      const std::string& host) const {
@@ -132,7 +132,7 @@
    const TemplateURLSet* urls = provider_map_->GetURLsForHost(host);
    if (!urls)
      return true;
-@@ -1599,7 +1612,8 @@ bool TemplateURLService::CanAddAutogener
+@@ -1614,7 +1627,8 @@ bool TemplateURLService::CanAddAutogener
  }
  
  bool TemplateURLService::CanReplace(const TemplateURL* t_url) const {
@@ -144,7 +144,7 @@
  TemplateURL* TemplateURLService::FindNonExtensionTemplateURLForKeyword(
 --- a/components/search_engines/template_url_service.h
 +++ b/components/search_engines/template_url_service.h
-@@ -719,6 +719,8 @@ class TemplateURLService : public WebDat
+@@ -722,6 +722,8 @@ class TemplateURLService : public WebDat
    // ---------- Browser state related members ---------------------------------
    PrefService* prefs_ = nullptr;
  

+ 3 - 3
patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch

@@ -3,7 +3,7 @@
 
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -211,6 +211,16 @@ const unsigned kOsDesktop = kOsMac | kOs
+@@ -216,6 +216,16 @@ const unsigned kOsDesktop = kOsMac | kOs
  const unsigned kOsAura = kOsWin | kOsLinux | kOsCrOS;
  #endif  // USE_AURA || OS_ANDROID
  
@@ -20,7 +20,7 @@
  const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
      {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
      {flags_ui::kGenericExperimentChoiceEnabled,
-@@ -1079,6 +1089,10 @@ const FeatureEntry::FeatureVariation kTa
+@@ -1033,6 +1043,10 @@ const FeatureEntry::FeatureVariation kVi
  //
  // When adding a new choice, add it to the end of the list.
  const FeatureEntry kFeatureEntries[] = {
@@ -75,7 +75,7 @@
  #include "base/logging.h"
  #include "base/metrics/histogram_macros.h"
  #include "base/stl_util.h"
-@@ -151,6 +152,13 @@ bool ExtensionManagement::IsInstallation
+@@ -166,6 +167,13 @@ bool ExtensionManagement::IsInstallation
  bool ExtensionManagement::IsOffstoreInstallAllowed(
      const GURL& url,
      const GURL& referrer_url) const {

+ 2 - 2
patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1101,6 +1101,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1055,6 +1055,10 @@ const FeatureEntry kFeatureEntries[] = {
       "Disable search engine collection",
       "Prevents search engines from being added automatically.",
       kOsAll, SINGLE_VALUE_TYPE("disable-search-engine-collection")},
@@ -23,7 +23,7 @@
  #include "base/lazy_instance.h"
  #include "base/numerics/safe_conversions.h"
  #include "base/stl_util.h"
-@@ -248,6 +249,13 @@ IDNConversionResult IDNToUnicodeWithAdju
+@@ -239,6 +240,13 @@ IDNConversionResult IDNToUnicodeWithAdju
    input16.reserve(host.length());
    input16.insert(input16.end(), host.begin(), host.end());
  

+ 1 - 1
patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch

@@ -3,7 +3,7 @@
 
 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -784,7 +784,8 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -787,7 +787,8 @@ void StartupBrowserCreatorImpl::AddInfoB
    if (!browser || !profile_ || browser->tab_strip_model()->count() == 0)
      return;
  

+ 2 - 2
patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -234,6 +234,16 @@ const FeatureEntry::Choice kShowAvatarBu
+@@ -239,6 +239,16 @@ const FeatureEntry::Choice kShowAvatarBu
       "never"}
  };
  
@@ -17,7 +17,7 @@
  const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
      {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
      {flags_ui::kGenericExperimentChoiceEnabled,
-@@ -3890,6 +3900,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3681,6 +3691,11 @@ const FeatureEntry kFeatureEntries[] = {
       kOsAndroid, FEATURE_VALUE_TYPE(safe_browsing::kUseLocalBlacklistsV2)},
  #endif  // defined(OS_ANDROID)
  

+ 13 - 8
patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -221,6 +221,19 @@ const FeatureEntry::Choice kExtensionHan
+@@ -226,6 +226,19 @@ const FeatureEntry::Choice kExtensionHan
       "always-prompt-for-install"},
  };
  
@@ -20,7 +20,7 @@
  const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
      {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
      {flags_ui::kGenericExperimentChoiceEnabled,
-@@ -3840,6 +3853,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3623,6 +3636,11 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(arc::kEnableUnifiedAudioFocusFeature)},
  #endif  // defined(OS_CHROMEOS)
  
@@ -34,7 +34,7 @@
       flag_descriptions::kUseAngleDescription, kOsWin,
 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
 +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
-@@ -229,12 +229,27 @@ void ToolbarView::Init() {
+@@ -234,6 +234,14 @@ void ToolbarView::Init() {
    if (media_router::MediaRouterEnabled(browser_->profile()))
      cast_ = media_router::CastToolbarButton::Create(browser_).release();
  
@@ -47,12 +47,17 @@
 +                                    browser_->profile()->IsGuestSession();
 +
    bool show_avatar_toolbar_button = true;
+   if (base::FeatureList::IsEnabled(
+           autofill::features::kAutofillEnableToolbarStatusChip)) {
+@@ -245,10 +253,17 @@ void ToolbarView::Init() {
+   } else {
  #if defined(OS_CHROMEOS)
-   // ChromeOS only badges Incognito and Guest icons in the browser window.
--  show_avatar_toolbar_button = browser_->profile()->IsOffTheRecord() ||
--                               browser_->profile()->IsGuestSession();
-+  show_avatar_toolbar_button = in_incognito_or_guest_mode;
- #endif  // !defined(OS_CHROMEOS)
+     // ChromeOS only badges Incognito and Guest icons in the browser window.
+-    show_avatar_toolbar_button = browser_->profile()->IsOffTheRecord() ||
+-                                 browser_->profile()->IsGuestSession();
++    show_avatar_toolbar_button = in_incognito_or_guest_mode;
+ #endif
+   }
 +
 +  if (flag_value == "always")
 +    show_avatar_toolbar_button = true;

+ 2 - 2
patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
 +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
-@@ -64,14 +64,13 @@ using content::WebContents;
+@@ -65,14 +65,13 @@ using content::WebContents;
  namespace {
  
  bool DetermineTabStripLayoutStacked(PrefService* prefs, bool* adjust_layout) {
@@ -22,7 +22,7 @@
  
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1079,6 +1079,10 @@ const FeatureEntry::FeatureVariation kTa
+@@ -1033,6 +1033,10 @@ const FeatureEntry::FeatureVariation kVi
  //
  // When adding a new choice, add it to the end of the list.
  const FeatureEntry kFeatureEntries[] = {

+ 9 - 9
patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch

@@ -1,9 +1,9 @@
 # Disables IPv6 probing and adds an option to change the IPv6 probing result
 # TODO: Consider adding a chrome://flag to set the command-line flag
 
---- a/net/dns/host_resolver_impl.cc
-+++ b/net/dns/host_resolver_impl.cc
-@@ -28,6 +28,7 @@
+--- a/net/dns/host_resolver_manager.cc
++++ b/net/dns/host_resolver_manager.cc
+@@ -29,6 +29,7 @@
  #include "base/bind_helpers.h"
  #include "base/callback.h"
  #include "base/callback_helpers.h"
@@ -11,19 +11,19 @@
  #include "base/compiler_specific.h"
  #include "base/containers/linked_list.h"
  #include "base/debug/debugger.h"
-@@ -117,11 +118,6 @@ const unsigned kMinimumTTLSeconds = kCac
+@@ -120,11 +121,6 @@ const unsigned kMinimumTTLSeconds = kCac
  // cached.
  const int kIPv6ProbePeriodMs = 1000;
  
--/* RIPE NCC k.root-servers.net. 2001:7fd::1 (anycasted) */
--const uint8_t kIPv6ProbeAddress[] =
--    { 0x20, 0x01, 0x07, 0xfd, 0x00, 0x00, 0x00, 0x00,
--      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 };
+-// RIPE NCC k.root-servers.net. 2001:7fd::1 (anycasted), used for IPv6 probes.
+-const uint8_t kIPv6ProbeAddress[] = {0x20, 0x01, 0x07, 0xfd, 0x00, 0x00,
+-                                     0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-                                     0x00, 0x00, 0x00, 0x01};
 -
  enum DnsResolveStatus {
    RESOLVE_STATUS_DNS_SUCCESS = 0,
    RESOLVE_STATUS_PROC_SUCCESS,
-@@ -2752,7 +2748,7 @@ bool HostResolverImpl::IsIPv6Reachable(c
+@@ -2897,7 +2893,7 @@ bool HostResolverManager::IsIPv6Reachabl
    if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
        kIPv6ProbePeriodMs) {
      last_ipv6_probe_result_ =

+ 3 - 3
patches/extra/ungoogled-chromium/add-suggestions-url-field.patch

@@ -417,7 +417,7 @@
    void ReloadIcon(int index);
 --- a/components/search_engines/template_url_service.cc
 +++ b/components/search_engines/template_url_service.cc
-@@ -596,7 +596,8 @@ void TemplateURLService::IncrementUsageC
+@@ -595,7 +595,8 @@ void TemplateURLService::IncrementUsageC
  void TemplateURLService::ResetTemplateURL(TemplateURL* url,
                                            const base::string16& title,
                                            const base::string16& keyword,
@@ -427,7 +427,7 @@
    DCHECK(!IsCreatedByExtension(url));
    DCHECK(!keyword.empty());
    DCHECK(!search_url.empty());
-@@ -610,6 +611,7 @@ void TemplateURLService::ResetTemplateUR
+@@ -609,6 +610,7 @@ void TemplateURLService::ResetTemplateUR
    }
    data.safe_for_autoreplace = false;
    data.last_modified = clock_->Now();
@@ -435,7 +435,7 @@
    Update(url, TemplateURL(data));
  }
  
-@@ -2009,7 +2011,7 @@ TemplateURL* TemplateURLService::Add(std
+@@ -2030,7 +2032,7 @@ TemplateURL* TemplateURLService::Add(std
          // Neither engine can be replaced. Uniquify the existing keyword.
          base::string16 new_keyword = UniquifyKeyword(*existing_turl, false);
          ResetTemplateURL(existing_turl, existing_turl->short_name(),

+ 4 - 4
patches/extra/ungoogled-chromium/default-to-https-scheme.patch

@@ -22,7 +22,7 @@
  
 --- a/components/omnibox/browser/autocomplete_input.cc
 +++ b/components/omnibox/browser/autocomplete_input.cc
-@@ -221,7 +221,7 @@ metrics::OmniboxInputType AutocompleteIn
+@@ -228,7 +228,7 @@ metrics::OmniboxInputType AutocompleteIn
      // We don't know about this scheme.  It might be that the user typed a
      // URL of the form "username:password@foo.com".
      const base::string16 http_scheme_prefix =
@@ -31,7 +31,7 @@
                             url::kStandardSchemeSeparator);
      url::Parsed http_parts;
      base::string16 http_scheme;
-@@ -229,7 +229,7 @@ metrics::OmniboxInputType AutocompleteIn
+@@ -236,7 +236,7 @@ metrics::OmniboxInputType AutocompleteIn
      metrics::OmniboxInputType http_type =
          Parse(http_scheme_prefix + text, desired_tld, scheme_classifier,
                &http_parts, &http_scheme, &http_canonicalized_url);
@@ -40,7 +40,7 @@
                base::UTF16ToUTF8(http_scheme));
  
      if ((http_type == metrics::OmniboxInputType::URL) &&
-@@ -558,7 +558,7 @@ bool AutocompleteInput::HasHTTPScheme(co
+@@ -565,7 +565,7 @@ bool AutocompleteInput::HasHTTPScheme(co
    } else if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme, &scheme)) {
      utf8_input.erase(0, scheme.end() + 1);
    }
@@ -51,7 +51,7 @@
  void AutocompleteInput::UpdateText(const base::string16& text,
 --- a/components/omnibox/browser/autocomplete_provider.cc
 +++ b/components/omnibox/browser/autocomplete_provider.cc
-@@ -351,11 +351,11 @@ size_t AutocompleteProvider::TrimHttpPre
+@@ -230,11 +230,11 @@ size_t AutocompleteProvider::TrimHttpPre
    if (!AutocompleteInput::HasHTTPScheme(*url))
      return 0;
    size_t scheme_pos =

+ 1 - 1
patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch

@@ -2,7 +2,7 @@
 
 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -410,14 +410,14 @@ IDNConversionStatus IDNToUnicodeOneCompo
+@@ -424,14 +424,14 @@ bool IDNToUnicodeOneComponent(const base
  }  // namespace
  
  const FormatUrlType kFormatUrlOmitNothing = 0;

+ 1 - 1
patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch

@@ -3,7 +3,7 @@
 
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -3316,16 +3316,14 @@ ScriptValue WebGLRenderingContextBase::g
+@@ -3344,16 +3344,14 @@ ScriptValue WebGLRenderingContextBase::g
        return ScriptValue::CreateNull(script_state);
      case WebGLDebugRendererInfo::kUnmaskedRendererWebgl:
        if (ExtensionEnabled(kWebGLDebugRendererInfoName))

+ 7 - 7
patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch

@@ -17,7 +17,7 @@
  bool IsURLHandledByNetworkStack(const GURL& url) {
 --- a/chrome/browser/ui/browser_commands.cc
 +++ b/chrome/browser/ui/browser_commands.cc
-@@ -377,12 +377,6 @@ int GetContentRestrictions(const Browser
+@@ -375,12 +375,6 @@ int GetContentRestrictions(const Browser
      CoreTabHelper* core_tab_helper =
          CoreTabHelper::FromWebContents(current_tab);
      content_restrictions = core_tab_helper->content_restrictions();
@@ -30,16 +30,16 @@
      if (current_tab->ShowingInterstitialPage())
        content_restrictions |= CONTENT_RESTRICTION_PRINT;
    }
-@@ -956,8 +950,7 @@ bool CanSavePage(const Browser* browser)
-       prefs::kAllowFileSelectionDialogs)) {
+@@ -958,8 +952,7 @@ bool CanSavePage(const Browser* browser)
+           prefs::kAllowFileSelectionDialogs)) {
      return false;
    }
 -  return !browser->is_devtools() &&
--      !(GetContentRestrictions(browser) & CONTENT_RESTRICTION_SAVE);
+-         !(GetContentRestrictions(browser) & CONTENT_RESTRICTION_SAVE);
 +  return true;
  }
  
- void SendToMyDevices(Browser* browser) {
+ void ShowFindBar(Browser* browser) {
 --- a/components/offline_pages/core/offline_page_model.cc
 +++ b/components/offline_pages/core/offline_page_model.cc
 @@ -37,7 +37,7 @@ OfflinePageModel::DeletedPageInfo::Delet
@@ -53,7 +53,7 @@
  OfflinePageModel::OfflinePageModel() = default;
 --- a/content/common/url_schemes.cc
 +++ b/content/common/url_schemes.cc
-@@ -19,6 +19,10 @@ namespace content {
+@@ -20,6 +20,10 @@ namespace content {
  namespace {
  
  const char* const kDefaultSavableSchemes[] = {
@@ -64,7 +64,7 @@
    url::kHttpScheme,
    url::kHttpsScheme,
    url::kFileScheme,
-@@ -26,7 +30,13 @@ const char* const kDefaultSavableSchemes
+@@ -27,7 +31,13 @@ const char* const kDefaultSavableSchemes
    url::kFtpScheme,
    kChromeDevToolsScheme,
    kChromeUIScheme,

+ 4 - 4
patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/views/tabs/new_tab_button.cc
 +++ b/chrome/browser/ui/views/tabs/new_tab_button.cc
-@@ -64,10 +64,8 @@ const gfx::Size NewTabButton::kButtonSiz
+@@ -65,10 +65,8 @@ const gfx::Size NewTabButton::kButtonSiz
  NewTabButton::NewTabButton(TabStrip* tab_strip, views::ButtonListener* listener)
      : views::ImageButton(listener), tab_strip_(tab_strip) {
    set_animate_on_state_change(true);
@@ -9,11 +9,11 @@
                                ui::EF_MIDDLE_MOUSE_BUTTON);
 -#endif
  
-   // Initialize the ink drop mode for a ripple highlight on button press.
-   ink_drop_container_ = new views::InkDropContainerView();
+   SetInkDropMode(InkDropMode::ON);
+   set_ink_drop_visible_opacity(0.08f);
 --- a/chrome/browser/ui/views/tabs/tab_strip.cc
 +++ b/chrome/browser/ui/views/tabs/tab_strip.cc
-@@ -2662,15 +2662,12 @@ void TabStrip::ButtonPressed(views::Butt
+@@ -2643,15 +2643,12 @@ void TabStrip::ButtonPressed(views::Butt
      if (event.IsMouseEvent()) {
        const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
        if (mouse.IsOnlyMiddleMouseButton()) {

+ 1 - 1
patches/extra/ungoogled-chromium/popups-to-tabs.patch

@@ -2,7 +2,7 @@
 
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
-@@ -288,7 +288,7 @@ WindowOpenDisposition RenderViewImpl::Na
+@@ -289,7 +289,7 @@ WindowOpenDisposition RenderViewImpl::Na
      case blink::kWebNavigationPolicyNewWindow:
        return WindowOpenDisposition::NEW_WINDOW;
      case blink::kWebNavigationPolicyNewPopup:

+ 1 - 1
patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch

@@ -2,7 +2,7 @@
 
 --- a/chrome/browser/ui/startup/bad_flags_prompt.cc
 +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -55,7 +55,6 @@ static const char* kBadFlags[] = {
+@@ -59,7 +59,6 @@ static const char* kBadFlags[] = {
      // These flags disable sandbox-related security.
      service_manager::switches::kDisableGpuSandbox,
      service_manager::switches::kDisableSeccompFilterSandbox,