Release 79.0.3945.139

Explain how DRM works in Bromite
Mention enable-search-ready-omnibox flag
2020-01-26 18:15:04 +01:00 · 2020-01-24 10:02:21 +01:00 · 2020-01-18 21:22:39 +07:00 · 2020-01-17 22:22:16 +01:00 · 2020-01-11 17:11:14 +01:00 · 2020-01-08 03:02:57 +01:00
34 changed files with 260828 additions and 251 deletions
@@ -1,7 +1,23 @@
+# 79.0.3945.139
+* remove patch to automatically disable video decoding acceleration on Android 10+ and arm64
+* fix referral headers bug in non-DoH requests (fixes https://github.com/bromite/bromite/issues/470)
+* disable smart selection by default, enable web search in incognito mode
+* disable DRM media pre-provisioning (fixes https://github.com/bromite/bromite/issues/471)
+
+# 79.0.3945.123
+* updated User-agent version
+* increase minimum DoH timeout to 400ms (fixes https://github.com/bromite/bromite/issues/437)
+
+# 79.0.3945.111
+* automatically disable video decoding acceleration on Android 10+ and arm64
+* restore enable-horizontal-tab-switcher flag
+* remove non-working contextual search settings
+* disable QUIC by default
+* remove logging for DoH timeouts
+
 # 79.0.3945.107
 * always show cookies, javascript and ads site settings (fixes https://github.com/bromite/bromite/issues/133)
 * remove global ads and javascript menu options
-* fix crash with first tab open when using always incognito (fixes https://github.com/bromite/bromite/issues/453)

 # 79.0.3945.100
 * log timeout values for DoH
@@ -39,13 +39,23 @@ No.
 ## Is Bromite de-googled?

 Yes, although this has not been verified (and hardly can be) under all situations; if you were to find connections to cloud-based services please report them via the issue tracker.
+Bromite uses [ungoogled-chromium's python script](https://github.com/Eloston/ungoogled-chromium/blob/master/utils/domain_substitution.py) to disable URLs in the codebase since version `78.0.3904.93`.
+
 Projects which follow a strict approach on this are [Iridium](https://iridiumbrowser.de/) and [Inox patchset](https://github.com/gcarq/inox-patchset).

+## Does Bromite support DRM media?
+
+Yes, in order to play protected/encrypted media content the browser will use Android's DRM media framework to automatically negotiate access (same as Chromium).
+This means for example that requests to Android license servers will be performed (`www.googleapis.com`), see https://w3c.github.io/encrypted-media/#direct-individualization
+To disable this functionality you should disable protected content playback from Site settings -> Multimedia.
+
 ## What is the SystemWebView?
 It is the core component of Android for all web page visualizations. For example when you access a new wifi network and need to activate it, that is using the SystemWebView. If you do not know what it is then you do not need to install it.

 See also [the wiki page](https://github.com/bromite/bromite/wiki/Installing-SystemWebView) for community-contributed installation instructions.

+Ad-blocking was present and always enabled in the SystemWebView from version `72.0.3626.120` till version `77.0.3865.104`, when it stopped working due to [upstream NetworkService changes](https://docs.google.com/document/d/1TZEuPvr2KAbP4_TZpuuwtEEArQsyAkc2HDu68l66YwU/edit?ts=598244df#heading=h.ougoi5i6508y).
+
 ## How to enable DNS-over-HTTPS?

 See [this wiki page](https://github.com/bromite/bromite/wiki/Enabling-DNS-over-HTTPS).
@@ -67,17 +77,36 @@ You can use F-Droid client to install and receive updates via [the official Brom
 ## Does Bromite support WebRTC?
 Yes, since version 69. While the desktop version of Chromium has an option to disable it (video/audio site settings), the Android version cannot.

+The WebRTC functionality has always been using safe defaults to prevent leaks (disabled multiple routes and non-proxied UDP).
+
+## Using Bromite will favour the monopoly of the Chromium/Blink engine, why do you develop and maintain Bromite?
+In short, to show what a Chromium-based engine could do **for the user** if the user experience and needs were the main focus of modern browser design.
+
+For an Android browser using an alternative engine see [Fennec F-Droid](https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/).
+
+## Does Bromite support extensions?
+No; Bromite will support extensions only if upstream (Chromium) does, or similarly another project maintains the patch and functionality.
+
 # Features

-* native adblock engine
+* customizable adblock filters via user-provided URL
 * remove click-tracking and AMP from search results
-* DNS-over-HTTPS support via Google, Cloudflare, Quad9 and AdGuard servers
-* [proxy configuration page](https://github.com/bromite/bromite/wiki/ProxyConfiguration) with PAC and custom proxy lists support
-* [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines
-* chrome flags to disable custom intents and clear session on exit
+* DNS-over-HTTPS support with any valid IETF DoH endpoint
 * always-incognito mode
-* completely removed safe browsing and other privacy-unfriendly features
-* anti-fingerprinting mitigations for canvas, audio, client rects, webGL and sensor APIs
+* disable all field trials permanently
+* disable [QUIC](https://en.wikipedia.org/wiki/QUIC) by default
+* disable smart search by default, allow web search from incognito mode
+* always-visible cookies, javascript and ads site settings
+* remove Play integration binary blobs
+* use [CFI](https://en.wikipedia.org/wiki/Control-flow_integrity) on all architectures except x86
+* disable media router and remoting by default
+* disable dynamic module loading
+* enable site-per-process isolation for all devices with memory > 1GB
+* completely remove safe browsing and other privacy-unfriendly features
+* [proxy configuration page](https://github.com/bromite/bromite/wiki/ProxyConfiguration) with PAC and custom proxy lists support
+* [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines available by default
+* flags to disable custom intents and clear session on exit
+* flags to toggle anti-fingerprinting mitigations for canvas, audio, client rects, webGL and sensor APIs
 * use fixed User-Agent to conceal real model and browser version
 * privacy enhancement patches from [Iridium](https://iridiumbrowser.de/), [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/) and [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) projects
 * security enhancement patches from [GrapheneOS](https://github.com/GrapheneOS) project
@@ -87,17 +116,30 @@ Yes, since version 69. While the desktop version of Chromium has an option to di
 * allow playing videos in background tabs and disable pause on switching tabs
 * all codecs included (proprietary, open H.264 etc.)
 * [AV1 codec support](https://github.com/bromite/bromite/wiki/AV1-support)
+* [dav1d](https://code.videolan.org/videolan/dav1d) decoder enabled by default
 * built with official speed optimizations
+* increase number of autocomplete matches
+* allow changing default download storage location
+* do not ignore save prompt for users without SD cards
+* disable articles and increase number of icons on new tab page

-You can inspect all functionality/privacy changes by reading the patches: https://github.com/bromite/bromite/tree/master/build/patches
+You can inspect all functionality/privacy changes by reading the [patches](https://github.com/bromite/bromite/tree/master/build/patches) and/or the [CHANGELOG](./CHANGELOG.md).
+
+### Flags
+
+Flags which have been retired from upstream Chromium but are still available in Bromite.
+
+* `#enable-horizontal-tab-switcher`
+* `#pull-to-refresh`
+* `#enable-search-ready-omnibox`

 # Privacy limitations

-Bromite's privacy features, including anti-fingerprinting mitigations (which can be easily circumvented), **are not to be considered useful for journalists and people living in countries with freedom limitations**, please look at [Tor Browser](https://2019.www.torproject.org/projects/torbrowser.html.en) in such cases.
+Bromite's privacy features, including anti-fingerprinting mitigations (which are not comprehensive), **are not to be considered useful for journalists and people living in countries with freedom limitations**, please look at [Tor Browser](https://www.torproject.org/download/) in such cases.

 # Releases

-All built versions are available as [releases](https://github.com/bromite/bromite/releases); the [official website](https://www.bromite.org/) points to those releases and - when browsing via Android - it will automatically select the one apt for your device (or none otherwise).
+All built versions are available as [releases](https://github.com/bromite/bromite/releases); the [official website](https://www.bromite.org/) points to those releases and - when browsing via Android - it will automatically highlight the one apt for your device (or none otherwise).

 Each tag corresponds to a Chromium Stable release tag.

@@ -116,8 +158,6 @@ arm64_ChromePublic.apk: OK
 arm64_ChromeModernPublic.apk: OK
 ```

-If you prefer an UI-based tool, you might want to look into [GtkHash](https://github.com/tristanheaven/gtkhash).
-
 You can verify authenticity, e.g. that the author ([csagan5](https://github.com/csagan5)) released the file, by using gpg2:
 ```
 $ gpg2 --quiet --verify brm_68.0.3440.54.sha256.txt.asc
@@ -128,8 +168,6 @@ gpg: Good signature from "csagan5 <32685696+csagan5@users.noreply.github.com>"

 You can download csagan5's public GnuPG key from here: [csagan5.asc](./csagan5.asc).

-**NOTE:** releases before v68 did not have published signed hashes files.
-
 # How to build

 The [Bromite main repository](https://github.com/bromite/bromite) contains tags for each corresponding Chromium release (see https://chromium.googlesource.com/chromium/src.git).
@@ -161,6 +199,7 @@ Bromite uses an unindexed filter file, which is periodically published at https:
 * [EasyPrivacy](https://easylist.to/#easyprivacy)
 * [uBlock Origin](https://github.com/uBlockOrigin)
 * [Peter Lowe's Ad and tracking server list](https://pgl.yoyo.org/adservers/)
+
 # License

 The patches published as part of the Bromite project are released under [GNU GPL v3](./LICENSE).
@@ -138,5 +138,10 @@ Use-dummy-DFM-installer.patch
 Disable-password-reuse-detection-on-android.patch
 Allow-building-without-feed-support.patch
 Disable-addresses-autofill-by-default.patch
-Log-DoH-timeout.patch
 Always-show-site-settings-for-cookies-javascript-and-ads.patch
+Automated-domain-substitution.patch
+Do-not-enable-QUIC-by-default.patch
+Restore-enable-horizontal-tab-switcher-flag.patch
+Use-a-minimum-DoH-timeout-of-400ms.patch
+Disable-DRM-media-origin-IDs-preprovisioning.patch
+Disable-smart-selection-by-default.patch
@@ -38,7 +38,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 +  SEARCH_ENGINE_DUCKDUCKGOLIGHT,
   SEARCH_ENGINE_PARSIJOO,
   SEARCH_ENGINE_QWANT,
- 
+   SEARCH_ENGINE_GIVERO,
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -44,9 +44,9 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
 diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
 --- a/components/search_engines/search_engine_type.h
 +++ b/components/search_engines/search_engine_type.h
-@@ -68,6 +68,7 @@ enum SearchEngineType {
-   SEARCH_ENGINE_PARSIJOO,
-   SEARCH_ENGINE_QWANT,
+@@ -74,6 +74,7 @@ enum SearchEngineType {
+   SEARCH_ENGINE_OCEANHERO,
+   SEARCH_ENGINE_PRIVACYWALL,
 
 +  SEARCH_ENGINE_GOOGLE_EN,
   SEARCH_ENGINE_MAX  // Bounding value needed for UMA histogram macro.
@@ -253,7 +253,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
 const PrepopulatedEngine* const engines_CZ[] = {
 -    &google,
 +    &googleen, &google,
-     &seznam,
+     &seznam_cz,
     &bing,
     &yahoo,
@@ -211,7 +211,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
@@ -221,7 +221,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
 const PrepopulatedEngine* const engines_CZ[] = {
 -    &googleen, &google,
 +    &googleen, &google, &qwant,
-     &seznam,
+     &seznam_cz,
     &bing,
     &yahoo,
@@ -214,7 +214,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
@@ -35,9 +35,9 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 +        android:title="@string/allow_custom_tab_intents_title"
 +        android:summary="@string/allow_custom_tab_intents_summary"
 +        android:defaultValue="false" />
-     <android.support.v7.preference.Preference
-         android:key="contextual_search"
-         android:title="@string/contextual_search_title"
+     <Preference
+         android:key="clear_browsing_data"
+         android:title="@string/clear_browsing_data_title"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
@@ -61,7 +61,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
-@@ -42,6 +42,8 @@ public class PrivacyPreferences
+@@ -41,6 +41,8 @@ public class PrivacyPreferences
 
     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
 
@@ -70,7 +70,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         PreferenceUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
-@@ -76,6 +78,10 @@ public class PrivacyPreferences
+@@ -75,6 +77,10 @@ public class PrivacyPreferences
             PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
             PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
@@ -78,10 +78,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
 +            sharedPreferencesEditor.apply();
-         } else if (PREF_CONTEXTUAL_SEARCH.equals(key)) {
-             PrefServiceBridge.getInstance().setContextualSearchPreference(((boolean) newValue) ? "true" : "false");
         } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
-@@ -114,6 +120,11 @@ public class PrivacyPreferences
+             PrefServiceBridge.getInstance().setBoolean(
+                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
+@@ -111,6 +117,11 @@ public class PrivacyPreferences
                     prefServiceBridge.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
         }
 
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 // 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 ==
-@@ -2596,6 +2601,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2633,6 +2638,9 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kPassiveDocumentEventListenersName,
      flag_descriptions::kPassiveDocumentEventListenersDescription, kOsAll,
      FEATURE_VALUE_TYPE(features::kPassiveDocumentEventListeners)},
@@ -13,7 +13,7 @@ Disable it by default on Android as it is everywhere else
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1633,6 +1633,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1670,6 +1670,10 @@ const FeatureEntry kFeatureEntries[] = {
     {"enable-webassembly-threads", flag_descriptions::kEnableWasmThreadsName,
      flag_descriptions::kEnableWasmThreadsDescription, kOsAll,
      FEATURE_VALUE_TYPE(features::kWebAssemblyThreads)},
@@ -16,7 +16,7 @@ Subject: Add flag to disable IPv6 probes
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -3244,6 +3244,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3281,6 +3281,11 @@ const FeatureEntry kFeatureEntries[] = {
          kMarkHttpAsFeatureVariations,
          "HTTPReallyBadFinal")},
 
@@ -11,7 +11,7 @@ Subject: Add flag to disable WebGL
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1425,6 +1425,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1462,6 +1462,9 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kAccelerated2dCanvasName,
      flag_descriptions::kAccelerated2dCanvasDescription, kOsAll,
      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)},
@@ -20,7 +20,7 @@ legacy acceleration events.
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1659,6 +1659,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1696,6 +1696,12 @@ const FeatureEntry kFeatureEntries[] = {
     {"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName,
      flag_descriptions::kGpuRasterizationDescription, kOsAll,
      MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)},
@@ -3,12 +3,12 @@ Date: Sat, 7 Sep 2019 15:07:42 +0200
 Subject: Add option to not persist tabs across sessions

 ---
- chrome/android/java/res/values/values.xml             |  3 +++
- chrome/android/java/res/xml/privacy_preferences.xml   |  5 +++++
- .../chromium/chrome/browser/ChromeTabbedActivity.java |  4 +++-
- .../preferences/privacy/PrivacyPreferences.java       | 11 +++++++++++
- .../android/java/strings/android_chrome_strings.grd   |  6 ++++++
- 5 files changed, 28 insertions(+), 1 deletion(-)
+ chrome/android/java/res/values/values.xml            |  3 +++
+ chrome/android/java/res/xml/privacy_preferences.xml  |  5 +++++
+ .../chrome/browser/ChromeTabbedActivity.java         |  4 +++-
+ .../preferences/privacy/PrivacyPreferences.java      | 12 ++++++++++++
+ .../android/java/strings/android_chrome_strings.grd  |  6 ++++++
+ 5 files changed, 29 insertions(+), 1 deletion(-)

 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
@@ -26,10 +26,10 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -38,6 +38,11 @@
-         android:key="contextual_search"
-         android:title="@string/contextual_search_title"
-         android:fragment="org.chromium.chrome.browser.preferences.privacy.ContextualSearchPreferenceFragment" />
+@@ -34,6 +34,11 @@
+         android:title="@string/allow_custom_tab_intents_title"
+         android:summary="@string/allow_custom_tab_intents_summary"
+         android:defaultValue="false" />
 +    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
 +        android:key="close_tabs_on_exit"
 +        android:title="@string/close_tabs_on_exit_title"
@@ -72,15 +72,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 import org.chromium.base.BuildInfo;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeFeatureList;
-@@ -37,6 +39,7 @@ public class PrivacyPreferences
+@@ -36,6 +38,7 @@ public class PrivacyPreferences
+     private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
-     private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
     private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
 +    private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
     private static final String PREF_DO_NOT_TRACK = "do_not_track";
     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
 
-@@ -87,6 +90,10 @@ public class PrivacyPreferences
+@@ -84,6 +87,10 @@ public class PrivacyPreferences
         } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
             PrefServiceBridge.getInstance().setBoolean(
                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
@@ -91,10 +91,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
         }
 
         return true;
-@@ -137,6 +144,10 @@ public class PrivacyPreferences
-             contextualPref.setSummary(isContextualSearchEnabled ? textOn : textOff);
+@@ -127,6 +134,11 @@ public class PrivacyPreferences
+             doNotTrackPref.setSummary(
+                     prefServiceBridge.isDoNotTrackEnabled() ? R.string.text_on : R.string.text_off);
         }
- 
+
 +        ChromeBaseCheckBoxPreference closeTabsOnExitPref =
 +                (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
 +        closeTabsOnExitPref.setOnPreferenceChangeListener(this);
@@ -318,7 +318,7 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
-@@ -223,6 +223,26 @@ public class FeatureUtilities {
+@@ -224,6 +224,26 @@ public class FeatureUtilities {
         FeatureUtilitiesJni.get().setCustomTabVisible(visible);
     }
 
@@ -345,7 +345,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti
     /**
      * Records whether the activity is in multi-window mode with native-side feature utilities.
      * @param isInMultiWindowMode Whether the activity is in Android N multi-window mode.
-@@ -852,6 +872,10 @@ public class FeatureUtilities {
+@@ -878,6 +898,10 @@ public class FeatureUtilities {
     interface Natives {
         void setCustomTabVisible(boolean visible);
         void setIsInMultiWindowMode(boolean isInMultiWindowMode);
@@ -37,7 +37,7 @@ Download filters by checking Last-Modified header first
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
-@@ -277,6 +277,14 @@ public class FeatureUtilities {
+@@ -278,6 +278,14 @@ public class FeatureUtilities {
         cacheServiceManagerForBackgroundPrefetch();
     }
 
@@ -52,7 +52,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti
     /**
      * @return True if tab model merging for Android N+ is enabled.
      */
-@@ -845,5 +853,7 @@ public class FeatureUtilities {
+@@ -871,5 +879,7 @@ public class FeatureUtilities {
         void setCustomTabVisible(boolean visible);
         void setIsInMultiWindowMode(boolean isInMultiWindowMode);
         boolean isNetworkServiceWarmUpEnabled();
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 24 Jan 2020 09:46:48 +0100
+Subject: Disable DRM media origin IDs preprovisioning
+
+---
+ media/base/media_switches.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
+--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
+@@ -442,7 +442,7 @@ const base::Feature kMediaDrmPersistentLicense{
+ // MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs
+ // which will trigger provisioning process after MediaDrmBridge is created.
+ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",
+-                                             base::FEATURE_ENABLED_BY_DEFAULT};
+                                             base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ // Determines if MediaDrmOriginIdManager should attempt to pre-provision origin
+ // IDs at startup (whenever a profile is loaded). Also used by tests that
+-- 
+2.17.1
+
@@ -40,7 +40,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -231,7 +231,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -226,7 +226,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
       prefs::kMediaRouterFirstRunFlowAcknowledged,
       false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -8,7 +8,7 @@ Contains Android-specific fixes to remove Safe Browsing
 chrome/android/chrome_java_sources.gni        |  1 -
 .../java/res/xml/privacy_preferences.xml      | 21 -----
 .../res/xml/sync_and_services_preferences.xml | 20 -----
- .../privacy/PrivacyPreferences.java           | 81 -------------------
+ .../privacy/PrivacyPreferences.java           | 77 -------------------
 .../browser/webshare/ShareServiceImpl.java    |  6 --
 .../java/strings/android_chrome_strings.grd   | 33 --------
 chrome/browser/BUILD.gn                       |  2 -
@@ -16,11 +16,11 @@ Contains Android-specific fixes to remove Safe Browsing
 chrome/browser/browser_process_impl.cc        | 36 ---------
 chrome/browser/browser_process_impl.h         |  6 --
 .../chrome_browsing_data_remover_delegate.cc  | 41 ----------
- .../browser/chrome_content_browser_client.cc  | 60 +++-----------
+ .../browser/chrome_content_browser_client.cc  | 60 ++++-----------
 .../file_type_policies_component_installer.cc | 16 +---
- .../chrome_download_manager_delegate.cc       | 31 +++----
+ .../chrome_download_manager_delegate.cc       | 31 +++-----
 .../chrome_download_manager_delegate.h        |  8 +-
- .../browser/download/download_item_model.cc   | 13 ++-
+ .../browser/download/download_item_model.cc   | 13 +++-
 chrome/browser/download/download_item_model.h |  4 +
 chrome/browser/download/download_prefs.cc     | 17 ++--
 .../download/download_target_determiner.cc    | 46 +++++------
@@ -29,9 +29,9 @@ Contains Android-specific fixes to remove Safe Browsing
 .../browser/download/download_target_info.h   |  4 +
 chrome/browser/download/download_ui_model.cc  |  4 +
 chrome/browser/download/download_ui_model.h   |  4 +
- .../extensions/api/downloads/downloads_api.cc | 39 +--------
+ .../extensions/api/downloads/downloads_api.cc | 39 +---------
 .../extensions/api/downloads/downloads_api.h  | 10 ---
- .../webstore_private/webstore_private_api.cc  | 44 +---------
+ .../webstore_private/webstore_private_api.cc  | 44 +----------
 .../extensions/blacklist_state_fetcher.cc     | 34 +-------
 .../extensions/blacklist_state_fetcher.h      |  3 -
 .../metrics/chrome_metrics_service_client.cc  |  3 -
@@ -47,15 +47,15 @@ Contains Android-specific fixes to remove Safe Browsing
 .../chrome_subresource_filter_client.cc       | 10 ---
 chrome/browser/ui/BUILD.gn                    |  1 -
 chrome/browser/ui/tab_helpers.cc              |  8 --
- .../ui/webui/interstitials/interstitial_ui.cc | 13 +--
+ .../ui/webui/interstitials/interstitial_ui.cc | 13 +---
 chrome/common/safe_browsing/BUILD.gn          | 15 ----
 .../chrome_content_renderer_client.cc         |  1 -
 components/safe_browsing/features.cc          |  2 +-
 .../unified_consent_service.cc                |  2 +-
- .../native_file_system_file_writer_impl.cc    | 48 +----------
+ .../native_file_system_file_writer_impl.cc    | 48 +-----------
 .../native_file_system_file_writer_impl.h     | 15 +---
 .../native_file_system_permission_context.h   |  7 --
- 50 files changed, 127 insertions(+), 637 deletions(-)
+ 50 files changed, 127 insertions(+), 633 deletions(-)

 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
@@ -148,15 +148,7 @@ diff --git a/chrome/android/java/res/xml/sync_and_services_preferences.xml b/chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
-@@ -16,7 +16,6 @@ import android.view.MenuItem;
- import org.chromium.base.BuildInfo;
- import org.chromium.chrome.R;
- import org.chromium.chrome.browser.ChromeFeatureList;
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
- import org.chromium.chrome.browser.help.HelpAndFeedback;
- import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference;
- import org.chromium.chrome.browser.preferences.ManagedPreferenceDelegate;
-@@ -35,11 +34,7 @@ import org.chromium.ui.text.SpanApplier;
+@@ -34,11 +34,7 @@ import org.chromium.ui.text.SpanApplier;
  */
 public class PrivacyPreferences
         extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
@@ -166,9 +158,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 -            "safe_browsing_scout_reporting";
 -    private static final String PREF_SAFE_BROWSING = "safe_browsing";
     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
-     private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
     private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
-@@ -48,7 +43,6 @@ public class PrivacyPreferences
+     private static final String PREF_DO_NOT_TRACK = "do_not_track";
+@@ -46,7 +42,6 @@ public class PrivacyPreferences
     private static final String PREF_SYNC_AND_SERVICES_LINK_DIVIDER =
             "sync_and_services_link_divider";
     private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
@@ -176,7 +168,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 
     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
 
-@@ -74,32 +68,11 @@ public class PrivacyPreferences
+@@ -72,28 +67,11 @@ public class PrivacyPreferences
         getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER));
         getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));
 
@@ -190,10 +182,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
         searchSuggestionsPref.setOnPreferenceChangeListener(this);
         searchSuggestionsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 
-        if (!ContextualSearchFieldTrial.isEnabled()) {
-            getPreferenceScreen().removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
-        }
-
 -        // Listen to changes to the Extended Reporting pref.
 -        ChromeBaseCheckBoxPreference scoutReportingPref =
 -                (ChromeBaseCheckBoxPreference) findPreference(
@@ -209,7 +197,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
         updateSummaries();
      }
 
-@@ -108,15 +81,8 @@ public class PrivacyPreferences
+@@ -102,15 +80,8 @@ public class PrivacyPreferences
         String key = preference.getKey();
         if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
             PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
@@ -222,10 +210,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
             PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
 -        } else if (PREF_NAVIGATION_ERROR.equals(key)) {
 -            PrefServiceBridge.getInstance().setResolveNavigationErrorEnabled((boolean) newValue);
-         } else if (PREF_CONTEXTUAL_SEARCH.equals(key)) {
-             PrefServiceBridge.getInstance().setContextualSearchPreference(((boolean) newValue) ? "true" : "false");
         } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
-@@ -142,32 +108,12 @@ public class PrivacyPreferences
+             PrefServiceBridge.getInstance().setBoolean(
+                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
+@@ -134,32 +105,12 @@ public class PrivacyPreferences
         CharSequence textOn = getActivity().getResources().getText(R.string.text_on);
         CharSequence textOff = getActivity().getResources().getText(R.string.text_off);
 
@@ -258,10 +246,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
         CheckBoxPreference canMakePaymentPref =
                 (CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
         if (canMakePaymentPref != null) {
-@@ -187,42 +133,15 @@ public class PrivacyPreferences
-             contextualPref.setSummary(isContextualSearchEnabled ? textOn : textOff);
+@@ -172,43 +123,15 @@ public class PrivacyPreferences
+             doNotTrackPref.setSummary(
+                     prefServiceBridge.isDoNotTrackEnabled() ? R.string.text_on : R.string.text_off);
         }
- 
+-
 -        Preference usageStatsPref = findPreference(PREF_USAGE_STATS);
 -        if (usageStatsPref != null) {
 -            if (BuildInfo.isAtLeastQ() && prefServiceBridge.getBoolean(Pref.USAGE_STATS_ENABLED)) {
@@ -0,0 +1,41 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 24 Jan 2020 19:17:22 +0100
+Subject: Disable smart selection by default
+
+Allow web search in incognito mode (reverts
+commit 48d4ae54f7565c429bf29cd63806aee5d7e93e69)
+
+Notice that re-enabling smart selection would make incognito mode potentially
+leak information through the TextClassifier set by OEM, if any
+---
+ chrome/browser/android/chrome_feature_list.cc                   | 2 +-
+ .../content/browser/selection/SelectionPopupControllerImpl.java | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
+--- a/chrome/browser/android/chrome_feature_list.cc
+++ b/chrome/browser/android/chrome_feature_list.cc
+@@ -352,7 +352,7 @@ const base::Feature kChromeSharingHub{"ChromeSharingHub",
+                                       base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kChromeSmartSelection{"ChromeSmartSelection",
+-                                          base::FEATURE_ENABLED_BY_DEFAULT};
+                                          base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kClickToCallOpenDialerDirectly{
+     "ClickToCallOpenDialerDirectly", base::FEATURE_ENABLED_BY_DEFAULT};
+diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
+--- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
+@@ -774,7 +774,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
+             menu.removeItem(R.id.select_action_menu_share);
+         }
+ 
+-        if (isFocusedNodeEditable() || isIncognito()
+        if (isFocusedNodeEditable()
+                 || !isSelectActionModeAllowed(MENU_ITEM_WEB_SEARCH)) {
+             menu.removeItem(R.id.select_action_menu_web_search);
+         }
+-- 
+2.17.1
+
@@ -26,7 +26,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -33,12 +33,5 @@
+@@ -29,12 +29,5 @@
         android:title="@string/clear_browsing_data_title"
         android:summary="@string/clear_browsing_data_summary"
         android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
@@ -0,0 +1,43 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 4 Jan 2020 14:46:12 +0100
+Subject: Do not enable QUIC by default
+
+For reference:
+* https://brave.com/quic-in-the-wild/
+* https://petsymposium.org/2019/files/papers/issue3/popets-2019-0046.pdf
+---
+ .../browser/network_session_configurator.cc                  | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/components/network_session_configurator/browser/network_session_configurator.cc b/components/network_session_configurator/browser/network_session_configurator.cc
+--- a/components/network_session_configurator/browser/network_session_configurator.cc
+++ b/components/network_session_configurator/browser/network_session_configurator.cc
+@@ -180,7 +180,7 @@ bool ShouldEnableQuic(base::StringPiece quic_trial_group,
+   return quic_trial_group.starts_with(kQuicFieldTrialEnabledGroupName) ||
+          quic_trial_group.starts_with(kQuicFieldTrialHttpsEnabledGroupName) ||
+          base::LowerCaseEqualsASCII(
+-             GetVariationParam(quic_trial_params, "enable_quic"), "true");
+             GetVariationParam(quic_trial_params, "enable_quic"), "false");
+ }
+ 
+ bool ShouldEnableQuicProxiesForHttpsUrls(
+@@ -188,7 +188,7 @@ bool ShouldEnableQuicProxiesForHttpsUrls(
+   return base::LowerCaseEqualsASCII(
+       GetVariationParam(quic_trial_params,
+                         "enable_quic_proxies_for_https_urls"),
+-      "true");
+      "false");
+ }
+ 
+ bool ShouldRetryWithoutAltSvcOnQuicErrors(
+@@ -468,7 +468,6 @@ void ConfigureQuicParams(base::StringPiece quic_trial_group,
+   params->enable_quic =
+       ShouldEnableQuic(quic_trial_group, quic_trial_params,
+                        is_quic_force_disabled, is_quic_force_enabled);
+-
+   params->enable_server_push_cancellation =
+       ShouldEnableServerPushCancelation(quic_trial_params);
+ 
+-- 
+2.17.1
+
@@ -1,27 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 15 Dec 2019 17:59:04 +0100
-Subject: Log DoH timeout
-
---
- net/dns/dns_session.cc | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/net/dns/dns_session.cc b/net/dns/dns_session.cc
--- a/net/dns/dns_session.cc
-+++ b/net/dns/dns_session.cc
-@@ -325,9 +325,11 @@ base::TimeDelta DnsSession::NextTimeout(unsigned server_index, int attempt) {
- }
- 
- base::TimeDelta DnsSession::NextDohTimeout(unsigned doh_server_index) {
-  return NextTimeoutHelper(
-+  base::TimeDelta delta = NextTimeoutHelper(
-       GetServerStats(doh_server_index, true /* is _doh_server */),
-       0 /* num_backoffs */);
-+  LOG(INFO) << "DoH: using timeout: " << delta;
-+  return delta;
- }
- 
- base::TimeDelta DnsSession::NextTimeoutHelper(ServerStats* server_stats,
-- 
-2.17.1
-
@@ -79,8 +79,8 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profil
 -      true,
 +      false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- #if defined(OS_ANDROID)
-   registry->RegisterStringPref(
+   registry->RegisterBooleanPref(prefs::kSessionExitedCleanly, true);
+   registry->RegisterStringPref(prefs::kSessionExitType, std::string());
 diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html b/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
@@ -76,7 +76,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 #include "third_party/leveldatabase/leveldb_features.h"
 #include "ui/accessibility/accessibility_features.h"
 #include "ui/accessibility/accessibility_switches.h"
-@@ -1466,12 +1467,24 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1503,12 +1504,24 @@ const FeatureEntry kFeatureEntries[] = {
     {"enable-webrtc-srtp-aes-gcm", flag_descriptions::kWebrtcSrtpAesGcmName,
      flag_descriptions::kWebrtcSrtpAesGcmDescription, kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnableWebRtcSrtpAesGcm)},
@@ -4,27 +4,27 @@ Subject: Reduce HTTP headers in DoH requests to bare minimum

 Serve DoH requests with maximum priority.
 ---
- net/base/load_flags_list.h              |  6 ++++++
+ net/base/load_flags_list.h              |  9 +++++++++
 net/dns/dns_transaction.cc              |  3 ++-
 net/url_request/url_request_http_job.cc | 16 +++++++++++-----
- 3 files changed, 19 insertions(+), 6 deletions(-)
+ 3 files changed, 22 insertions(+), 6 deletions(-)

 diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h
 --- a/net/base/load_flags_list.h
 +++ b/net/base/load_flags_list.h
-@@ -106,6 +106,12 @@ LOAD_FLAG(SUPPORT_ASYNC_REVALIDATION, 1 << 16)
- // the LOAD_CAN_USE_RESTRICTED_PREFETCH load flag.
- LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 17)
- 
+@@ -112,3 +112,12 @@ LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 17)
+ // is considered privileged, and therefore this flag must only be set from a
+ // trusted process.
+ LOAD_FLAG(CAN_USE_RESTRICTED_PREFETCH, 1 << 18)
+
+
+
+
 +// This load will not send Accept-Language or User-Agent headers, and not
 +// advertise brotli encoding.
 +// Used to comply with IETF (draft) DNS-over-HTTPS:
 +// "Implementors SHOULD NOT set non-essential HTTP headers in DoH client requests."
-+LOAD_FLAG(MINIMAL_HEADERS, 1 << 18)
-+
- // This flag must be set on requests that are allowed to reuse cache entries
- // that are marked as RESTRICTED_PREFETCH. Requests without this flag cannot
- // reuse restricted prefetch responses in the cache. Restricted response reuse
+LOAD_FLAG(MINIMAL_HEADERS, 1 << 19)
 diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
 --- a/net/dns/dns_transaction.cc
 +++ b/net/dns/dns_transaction.cc
@@ -467,7 +467,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.usage_stats.UsageStatsConsentDialog;
 import org.chromium.ui.text.NoUnderlineClickableSpan;
-@@ -40,9 +39,6 @@ public class PrivacyPreferences
+@@ -39,9 +38,6 @@ public class PrivacyPreferences
     private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
     private static final String PREF_DO_NOT_TRACK = "do_not_track";
     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
@@ -477,7 +477,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 
     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
 
-@@ -65,9 +61,6 @@ public class PrivacyPreferences
+@@ -64,9 +60,6 @@ public class PrivacyPreferences
         networkPredictionPref.setOnPreferenceChangeListener(this);
         networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 4 Jan 2020 14:49:43 +0100
+Subject: Restore enable-horizontal-tab-switcher flag
+
+---
+ chrome/browser/flag-metadata.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
+--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
+@@ -1360,7 +1360,7 @@
+   {
+     "name": "enable-horizontal-tab-switcher",
+     "owners": [ "memex-team@9oo91e.qjz9zk" ],
+-    "expiry_milestone": 77
+    "expiry_milestone": -1
+   },
+   {
+     "name": "enable-hosted-app-quit-notification",
+-- 
+2.17.1
+
@@ -45,7 +45,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggest
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1972,6 +1972,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2009,6 +2009,9 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kAndroidAutofillAccessibilityName,
      flag_descriptions::kAndroidAutofillAccessibilityDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(features::kAndroidAutofillAccessibility)},
@@ -3,12 +3,34 @@ Date: Mon, 14 Oct 2019 20:27:33 +0200
 Subject: Revert "[Merge to M78] Enable AImageReader by default."

 This reverts commit 60c3d4531b180b911767fb3ea7c3553d7f408c25.
---
- gpu/config/gpu_finch_features.cc | 2 +-
- gpu/ipc/service/gpu_init.cc      | 8 ++------
- media/base/media_switches.cc     | 2 +-
- 3 files changed, 4 insertions(+), 8 deletions(-)

+Automatically disable hardware acceleration for Android Q on arm64
+---
+ chrome/browser/android/chrome_startup_flags.cc | 2 ++
+ gpu/config/gpu_finch_features.cc               | 2 +-
+ gpu/ipc/service/gpu_init.cc                    | 8 ++------
+ media/base/media_switches.cc                   | 2 +-
+ 4 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/chrome/browser/android/chrome_startup_flags.cc b/chrome/browser/android/chrome_startup_flags.cc
+--- a/chrome/browser/android/chrome_startup_flags.cc
+++ b/chrome/browser/android/chrome_startup_flags.cc
+@@ -6,6 +6,7 @@
+ 
+ #include "chrome/browser/android/chrome_startup_flags.h"
+ 
+#include "base/android/build_info.h"
+ #include "base/android/jni_android.h"
+ #include "base/android/jni_string.h"
+ #include "base/android/scoped_java_ref.h"
+@@ -16,6 +17,7 @@
+ #include "chrome/common/chrome_switches.h"
+ #include "components/browser_sync/browser_sync_switches.h"
+ #include "components/dom_distiller/core/dom_distiller_switches.h"
+#include "content/public/common/content_switches.h"
+ #include "media/base/media_switches.h"
+ 
+ namespace {
 diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 --- a/gpu/config/gpu_finch_features.cc
 +++ b/gpu/config/gpu_finch_features.cc
@@ -6,73 +6,71 @@ Subject: Revert "Remove pre unified consent code in sync and privacy
 This reverts commit c672a0683e89eba3554e2562156b3c8532136f21.

 Restore translations
-Restore contextual search preference toggle
 Disable unified consent on Android
 Unified consent miscellanous backport fixes
 ---
- .../java/res/xml/privacy_preferences.xml      |  30 +++++
- .../privacy/PrivacyPreferences.java           | 117 +++++++++++++++---
+ .../java/res/xml/privacy_preferences.xml      |  26 +++++
+ .../privacy/PrivacyPreferences.java           | 103 +++++++++++++++---
 .../preferences/sync/SyncPreferenceUtils.java |   2 +-
 .../sync/SyncNotificationController.java      |  11 +-
 .../java/strings/android_chrome_strings.grd   |  15 +++
- .../android_chrome_strings_am.xtb             |  19 ++-
- .../android_chrome_strings_ar.xtb             |  19 ++-
- .../android_chrome_strings_bg.xtb             |  19 ++-
- .../android_chrome_strings_bn.xtb             |  19 ++-
- .../android_chrome_strings_ca.xtb             |  19 ++-
- .../android_chrome_strings_cs.xtb             |  19 ++-
- .../android_chrome_strings_da.xtb             |  19 ++-
- .../android_chrome_strings_de.xtb             |  19 ++-
- .../android_chrome_strings_el.xtb             |  19 ++-
- .../android_chrome_strings_en-GB.xtb          |  19 ++-
- .../android_chrome_strings_es-419.xtb         |  19 ++-
- .../android_chrome_strings_es.xtb             |  19 ++-
- .../android_chrome_strings_et.xtb             |  19 ++-
- .../android_chrome_strings_fa.xtb             |  19 ++-
- .../android_chrome_strings_fi.xtb             |  19 ++-
- .../android_chrome_strings_fil.xtb            |  19 ++-
- .../android_chrome_strings_fr.xtb             |  19 ++-
- .../android_chrome_strings_gu.xtb             |  19 ++-
- .../android_chrome_strings_hi.xtb             |  19 ++-
- .../android_chrome_strings_hr.xtb             |  19 ++-
- .../android_chrome_strings_hu.xtb             |  19 ++-
- .../android_chrome_strings_id.xtb             |  19 ++-
- .../android_chrome_strings_it.xtb             |  19 ++-
- .../android_chrome_strings_iw.xtb             |  19 ++-
- .../android_chrome_strings_ja.xtb             |  19 ++-
- .../android_chrome_strings_kn.xtb             |  19 ++-
- .../android_chrome_strings_ko.xtb             |  19 ++-
- .../android_chrome_strings_lt.xtb             |  19 ++-
- .../android_chrome_strings_lv.xtb             |  19 ++-
- .../android_chrome_strings_ml.xtb             |  19 ++-
- .../android_chrome_strings_mr.xtb             |  19 ++-
- .../android_chrome_strings_ms.xtb             |  19 ++-
- .../android_chrome_strings_nl.xtb             |  19 ++-
- .../android_chrome_strings_no.xtb             |  19 ++-
- .../android_chrome_strings_pl.xtb             |  19 ++-
- .../android_chrome_strings_pt-BR.xtb          |  19 ++-
- .../android_chrome_strings_pt-PT.xtb          |  19 ++-
- .../android_chrome_strings_ro.xtb             |  19 ++-
- .../android_chrome_strings_ru.xtb             |  19 ++-
- .../android_chrome_strings_sk.xtb             |  19 ++-
- .../android_chrome_strings_sl.xtb             |  19 ++-
- .../android_chrome_strings_sr.xtb             |  19 ++-
- .../android_chrome_strings_sv.xtb             |  19 ++-
- .../android_chrome_strings_sw.xtb             |  19 ++-
- .../android_chrome_strings_ta.xtb             |  19 ++-
- .../android_chrome_strings_te.xtb             |  19 ++-
- .../android_chrome_strings_th.xtb             |  19 ++-
- .../android_chrome_strings_tr.xtb             |  19 ++-
- .../android_chrome_strings_uk.xtb             |  19 ++-
- .../android_chrome_strings_vi.xtb             |  19 ++-
- .../android_chrome_strings_zh-CN.xtb          |  19 ++-
- .../android_chrome_strings_zh-TW.xtb          |  19 ++-
+ .../android_chrome_strings_am.xtb             |  19 +++-
+ .../android_chrome_strings_ar.xtb             |  19 +++-
+ .../android_chrome_strings_bg.xtb             |  19 +++-
+ .../android_chrome_strings_bn.xtb             |  19 +++-
+ .../android_chrome_strings_ca.xtb             |  19 +++-
+ .../android_chrome_strings_cs.xtb             |  19 +++-
+ .../android_chrome_strings_da.xtb             |  19 +++-
+ .../android_chrome_strings_de.xtb             |  19 +++-
+ .../android_chrome_strings_el.xtb             |  19 +++-
+ .../android_chrome_strings_en-GB.xtb          |  19 +++-
+ .../android_chrome_strings_es-419.xtb         |  19 +++-
+ .../android_chrome_strings_es.xtb             |  19 +++-
+ .../android_chrome_strings_et.xtb             |  19 +++-
+ .../android_chrome_strings_fa.xtb             |  19 +++-
+ .../android_chrome_strings_fi.xtb             |  19 +++-
+ .../android_chrome_strings_fil.xtb            |  19 +++-
+ .../android_chrome_strings_fr.xtb             |  19 +++-
+ .../android_chrome_strings_gu.xtb             |  19 +++-
+ .../android_chrome_strings_hi.xtb             |  19 +++-
+ .../android_chrome_strings_hr.xtb             |  19 +++-
+ .../android_chrome_strings_hu.xtb             |  19 +++-
+ .../android_chrome_strings_id.xtb             |  19 +++-
+ .../android_chrome_strings_it.xtb             |  19 +++-
+ .../android_chrome_strings_iw.xtb             |  19 +++-
+ .../android_chrome_strings_ja.xtb             |  19 +++-
+ .../android_chrome_strings_kn.xtb             |  19 +++-
+ .../android_chrome_strings_ko.xtb             |  19 +++-
+ .../android_chrome_strings_lt.xtb             |  19 +++-
+ .../android_chrome_strings_lv.xtb             |  19 +++-
+ .../android_chrome_strings_ml.xtb             |  19 +++-
+ .../android_chrome_strings_mr.xtb             |  19 +++-
+ .../android_chrome_strings_ms.xtb             |  19 +++-
+ .../android_chrome_strings_nl.xtb             |  19 +++-
+ .../android_chrome_strings_no.xtb             |  19 +++-
+ .../android_chrome_strings_pl.xtb             |  19 +++-
+ .../android_chrome_strings_pt-BR.xtb          |  19 +++-
+ .../android_chrome_strings_pt-PT.xtb          |  19 +++-
+ .../android_chrome_strings_ro.xtb             |  19 +++-
+ .../android_chrome_strings_ru.xtb             |  19 +++-
+ .../android_chrome_strings_sk.xtb             |  19 +++-
+ .../android_chrome_strings_sl.xtb             |  19 +++-
+ .../android_chrome_strings_sr.xtb             |  19 +++-
+ .../android_chrome_strings_sv.xtb             |  19 +++-
+ .../android_chrome_strings_sw.xtb             |  19 +++-
+ .../android_chrome_strings_ta.xtb             |  19 +++-
+ .../android_chrome_strings_te.xtb             |  19 +++-
+ .../android_chrome_strings_th.xtb             |  19 +++-
+ .../android_chrome_strings_tr.xtb             |  19 +++-
+ .../android_chrome_strings_uk.xtb             |  19 +++-
+ .../android_chrome_strings_vi.xtb             |  19 +++-
+ .../android_chrome_strings_zh-CN.xtb          |  19 +++-
+ .../android_chrome_strings_zh-TW.xtb          |  19 +++-
 .../chrome/browser/sync/SyncTestRule.java     |   9 +-
- .../chromium/chrome/browser/sync/UkmTest.java |  50 +++++++-
- chrome/browser/profiles/profile.cc            |   3 +-
+ .../chromium/chrome/browser/sync/UkmTest.java |  50 ++++++++-
+ chrome/browser/profiles/profile.cc            |   6 -
 .../unified_consent_service_factory.cc        |   5 +-
- components/unified_consent/feature.cc         |   2 +-
- 62 files changed, 1150 insertions(+), 82 deletions(-)
+ 61 files changed, 1130 insertions(+), 85 deletions(-)

 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
@@ -102,7 +100,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
         android:key="can_make_payment"
         android:title="@string/can_make_payment_title"
-@@ -19,15 +37,27 @@
+@@ -19,6 +37,10 @@
         android:key="usage_stats_reporting"
         android:title="@string/usage_stats_setting_title"
         android:persistent="false" />
@@ -113,13 +111,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
     <Preference
         android:fragment="org.chromium.chrome.browser.preferences.privacy.DoNotTrackPreference"
         android:key="do_not_track"
-         android:title="@string/do_not_track_title" />
-+    <android.support.v7.preference.Preference
-+        android:key="contextual_search"
-+        android:title="@string/contextual_search_title"
-+        android:fragment="org.chromium.chrome.browser.preferences.privacy.ContextualSearchPreferenceFragment" />
-     <Preference
-         android:key="clear_browsing_data"
+@@ -28,6 +50,10 @@
         android:title="@string/clear_browsing_data_title"
         android:summary="@string/clear_browsing_data_summary"
         android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
@@ -133,16 +125,15 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
-@@ -15,6 +15,8 @@ import android.view.MenuItem;
+@@ -15,6 +15,7 @@ import android.view.MenuItem;
 
 import org.chromium.base.BuildInfo;
 import org.chromium.chrome.R;
 +import org.chromium.chrome.browser.ChromeFeatureList;
-+import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
 import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference;
 import org.chromium.chrome.browser.preferences.ManagedPreferenceDelegate;
-@@ -33,18 +35,25 @@ import org.chromium.ui.text.SpanApplier;
+@@ -33,18 +34,24 @@ import org.chromium.ui.text.SpanApplier;
  */
 public class PrivacyPreferences
         extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
@@ -152,7 +143,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 +            "safe_browsing_scout_reporting";
 +    private static final String PREF_SAFE_BROWSING = "safe_browsing";
     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
-+    private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
     private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
 -    private static final String PREF_USAGE_STATS = "usage_stats_reporting";
     private static final String PREF_DO_NOT_TRACK = "do_not_track";
@@ -171,7 +161,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
         PreferenceUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
         getActivity().setTitle(R.string.prefs_privacy);
         setHasOptionsMenu(true);
-@@ -62,26 +71,57 @@ public class PrivacyPreferences
+@@ -62,26 +69,51 @@ public class PrivacyPreferences
         networkPredictionPref.setOnPreferenceChangeListener(this);
         networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 
@@ -196,10 +186,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 +        searchSuggestionsPref.setOnPreferenceChangeListener(this);
 +        searchSuggestionsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 +
-+        if (!ContextualSearchFieldTrial.isEnabled()) {
-+            getPreferenceScreen().removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
-+        }
-+
 +        // Listen to changes to the Extended Reporting pref.
 +        ChromeBaseCheckBoxPreference scoutReportingPref =
 +                (ChromeBaseCheckBoxPreference) findPreference(
@@ -233,15 +219,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
             PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
 +        } else if (PREF_NAVIGATION_ERROR.equals(key)) {
 +            PrefServiceBridge.getInstance().setResolveNavigationErrorEnabled((boolean) newValue);
-+        } else if (PREF_CONTEXTUAL_SEARCH.equals(key)) {
-+            PrefServiceBridge.getInstance().setContextualSearchPreference(((boolean) newValue) ? "true" : "false");
 +        } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
 +            PrefServiceBridge.getInstance().setBoolean(
 +                    Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
         }
 
         return true;
-@@ -99,6 +139,35 @@ public class PrivacyPreferences
+@@ -99,6 +131,35 @@ public class PrivacyPreferences
     public void updateSummaries() {
         PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
 
@@ -277,20 +261,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
         CheckBoxPreference canMakePaymentPref =
                 (CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
         if (canMakePaymentPref != null) {
-@@ -112,6 +181,12 @@ public class PrivacyPreferences
-                     prefServiceBridge.isDoNotTrackEnabled() ? R.string.text_on : R.string.text_off);
-         }
- 
-+        Preference contextualPref = findPreference(PREF_CONTEXTUAL_SEARCH);
-+        if (contextualPref != null) {
-+            boolean isContextualSearchEnabled = !prefServiceBridge.isContextualSearchDisabled();
-+            contextualPref.setSummary(isContextualSearchEnabled ? textOn : textOff);
-+        }
-+
-         Preference usageStatsPref = findPreference(PREF_USAGE_STATS);
-         if (usageStatsPref != null) {
-             if (BuildInfo.isAtLeastQ() && prefServiceBridge.getBoolean(Pref.USAGE_STATS_ENABLED)) {
-@@ -136,6 +211,18 @@ public class PrivacyPreferences
+@@ -136,6 +197,18 @@ public class PrivacyPreferences
         return preference -> {
             String key = preference.getKey();
             PrefServiceBridge prefs = PrefServiceBridge.getInstance();
@@ -1903,16 +1874,19 @@ diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/UkmTe
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -154,8 +154,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
- #if defined(OS_ANDROID)
-   registry->RegisterStringPref(
-       prefs::kContextualSearchEnabled,
+@@ -151,12 +151,6 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+       prefs::kSearchSuggestEnabled,
+       true,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+-#if defined(OS_ANDROID)
+-  registry->RegisterStringPref(
+-      prefs::kContextualSearchEnabled,
 -      std::string(),
 -      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-+      std::string());
- #endif  // defined(OS_ANDROID)
+-#endif  // defined(OS_ANDROID)
   registry->RegisterBooleanPref(prefs::kSessionExitedCleanly, true);
   registry->RegisterStringPref(prefs::kSessionExitType, std::string());
+   registry->RegisterInt64Pref(prefs::kSiteEngagementLastUpdateTime, 0,
 diff --git a/chrome/browser/unified_consent/unified_consent_service_factory.cc b/chrome/browser/unified_consent/unified_consent_service_factory.cc
 --- a/chrome/browser/unified_consent/unified_consent_service_factory.cc
 +++ b/chrome/browser/unified_consent/unified_consent_service_factory.cc
@@ -1928,18 +1902,6 @@ diff --git a/chrome/browser/unified_consent/unified_consent_service_factory.cc b
   };
 }
 
-diff --git a/components/unified_consent/feature.cc b/components/unified_consent/feature.cc
--- a/components/unified_consent/feature.cc
-+++ b/components/unified_consent/feature.cc
-@@ -11,7 +11,7 @@ namespace unified_consent {
- // base::Feature definition.
- const base::Feature kUnifiedConsent {
-   "UnifiedConsent",
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
-       base::FEATURE_DISABLED_BY_DEFAULT
- #else
-       base::FEATURE_ENABLED_BY_DEFAULT
 -- 
 2.17.1

@@ -13,7 +13,7 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f.
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1997,6 +1997,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2034,6 +2034,10 @@ const FeatureEntry kFeatureEntries[] = {
      SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)},
 #endif  // OS_MACOSX
 #if defined(OS_ANDROID)
@@ -0,0 +1,49 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 9 Jan 2020 19:59:08 +0100
+Subject: Use a minimum DoH timeout of 400ms
+
+---
+ net/dns/dns_session.cc | 7 ++++++-
+ net/dns/dns_session.h  | 1 +
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/net/dns/dns_session.cc b/net/dns/dns_session.cc
+--- a/net/dns/dns_session.cc
+++ b/net/dns/dns_session.cc
+@@ -118,6 +118,8 @@ DnsSession::DnsSession(const DnsConfig& config,
+   socket_pool_->Initialize(&config_.nameservers, net_log);
+   UMA_HISTOGRAM_CUSTOM_COUNTS("AsyncDNS.ServerCount",
+                               config_.nameservers.size(), 1, 10, 11);
+  // minimum timeout for all DoH requests
+  min_doh_timeout_ = base::TimeDelta::FromMilliseconds(400);
+   UpdateTimeouts(NetworkChangeNotifier::GetConnectionType());
+   InitializeServerStats();
+ }
+@@ -325,9 +327,12 @@ base::TimeDelta DnsSession::NextTimeout(unsigned server_index, int attempt) {
+ }
+ 
+ base::TimeDelta DnsSession::NextDohTimeout(unsigned doh_server_index) {
+-  return NextTimeoutHelper(
+  base::TimeDelta timeout = NextTimeoutHelper(
+       GetServerStats(doh_server_index, true /* is _doh_server */),
+       0 /* num_backoffs */);
+  if (timeout < min_doh_timeout_)
+     return min_doh_timeout_;
+  return timeout;
+ }
+ 
+ base::TimeDelta DnsSession::NextTimeoutHelper(ServerStats* server_stats,
+diff --git a/net/dns/dns_session.h b/net/dns/dns_session.h
+--- a/net/dns/dns_session.h
+++ b/net/dns/dns_session.h
+@@ -167,6 +167,7 @@ class NET_EXPORT_PRIVATE DnsSession : public base::RefCounted<DnsSession> {
+ 
+   base::TimeDelta initial_timeout_;
+   base::TimeDelta max_timeout_;
+  base::TimeDelta min_doh_timeout_;
+ 
+   // Track runtime statistics of each insecure DNS server.
+   std::vector<std::unique_ptr<ServerStats>> server_stats_;
+-- 
+2.17.1
+
@@ -18,7 +18,7 @@ diff --git a/components/version_info/version_info.cc b/components/version_info/v
 std::string GetProductNameAndVersionForUserAgent() {
 -  return "Chrome/" + GetVersionNumber();
 +  // latest stable version
-+  return "Chrome/79.0.3945.93";
+  return "Chrome/79.0.3945.136";
 }
 
 std::string GetProductName() {
Author	SHA1	Message	Date
csagan5	00411eb209	Release 79.0.3945.139	2020-01-26 18:15:04 +01:00
csagan5	a56884e75e	Explain how DRM works in Bromite	2020-01-24 10:02:21 +01:00
CarlandGitHub	1f363eba23	Mention enable-search-ready-omnibox flag Fixes #469	2020-01-18 21:22:39 +07:00
csagan5	6f5d36bc5c	Various improvements after proofreading	2020-01-17 22:22:16 +01:00
csagan5	a500255598	Release 79.0.3945.123	2020-01-11 17:11:14 +01:00
csagan5	af8378b675	Updated FAQs and features list	2020-01-08 03:02:57 +01:00
csagan5	3c916480b2	Document patch about video decode acceleration	2020-01-08 02:18:38 +01:00
csagan5	dbf32840c6	Release 79.0.3945.111	2020-01-08 02:14:39 +01:00
csagan5	4b8e47060b	Update features list	2020-01-06 09:44:32 +01:00
csagan5	43bf98a956	Remove entry about bug not yet fixed	2019-12-31 18:15:28 +01:00