From 52202a3ffb8a051242996f6c06b9c6f4714f4c02 Mon Sep 17 00:00:00 2001
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Fri, 27 Dec 2019 16:08:41 +0100
Subject: [PATCH] Release 79.0.3945.100

---
 CHANGELOG.md                    | 5 +++++
 build/GN_ARGS                   | 7 +++----
 build/bromite_patches_list.txt  | 5 +++--
 build/chromium_patches_list.txt | 1 +
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 814f8fb5..fc8742af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 79.0.3945.100
+* log timeout values for DoH
+* enable DFM (fixes https://github.com/bromite/bromite/issues/441)
+* updated User-agent version
+
 # 79.0.3945.94
 * removed patches which do not apply anymore (Widevine version punting, always show homepage settings, network errors UMA recording)
 * removed split APKs support (Play integration)
diff --git a/build/GN_ARGS b/build/GN_ARGS
index 18c108e0..c7902112 100644
--- a/build/GN_ARGS
+++ b/build/GN_ARGS
@@ -2,10 +2,10 @@ android_channel="stable"
 blink_symbol_level=1
 dcheck_always_on=false
 debuggable_apks=false
-dfmify_dev_ui=true
+dfmify_dev_ui=false
 disable_android_lint=true
-disable_autofill_assistant_dfm=false
-disable_tab_ui_dfm=false
+disable_autofill_assistant_dfm=true
+disable_tab_ui_dfm=true
 enable_av1_decoder=true
 enable_dav1d_decoder=true
 enable_feed_in_chrome=false
@@ -29,7 +29,6 @@ is_official_build=true
 rtc_build_examples=false
 safe_browsing_mode=0
 strip_absolute_paths_from_debug_symbols=true
-strip_debug_info=true
 symbol_level=1
 target_os="android"
 use_debug_fission=true
diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt
index b1201248..5e7fa44b 100644
--- a/build/bromite_patches_list.txt
+++ b/build/bromite_patches_list.txt
@@ -1,5 +1,7 @@
 Disable-third-party-cookies-by-default.patch
 Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch
+Disable-unified-consent-on-Android.patch
+Unified-consent-miscellanous-backport-fixes.patch
 Restore-classic-new-tab-page.patch
 Always-use-new-tab-page-for-default-home-page.patch
 Always-allow-partner-customisation.patch
@@ -122,7 +124,6 @@ disable-payment-support-by-default.patch
 disable-background-sync-by-default.patch
 disable-sensors-access-site-setting-by-default.patch
 Disable-media-router-and-remoting-by-default.patch
-Disable-unified-consent-on-Android.patch
 Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch
 Disable-search-ready-omnibox-by-default.patch
 disable-AdsBlockedInfoBar.patch
@@ -140,6 +141,6 @@ Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch
 Revert-flags-remove-disable-pull-to-refresh-effect.patch
 Use-dummy-DFM-installer.patch
 Disable-password-reuse-detection-on-android.patch
-Unified-consent-miscellanous-backport-fixes.patch
 Allow-building-without-feed-support.patch
 Disable-addresses-autofill-by-default.patch
+Log-DoH-timeout.patch
diff --git a/build/chromium_patches_list.txt b/build/chromium_patches_list.txt
index 77c03c57..0fabaea1 100644
--- a/build/chromium_patches_list.txt
+++ b/build/chromium_patches_list.txt
@@ -5,3 +5,4 @@ AV1-codec-support.patch
 Switch-to-fstack-protector-strong.patch
 Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
 Disable-password-reuse-detection-on-android.patch
+Allow-building-without-feed-support.patch