Release 70.0.3538.95

Release 70.0.3538.87
Release 70.0.3538.83
2018-11-05 22:33:05 +01:00 · 2018-11-03 23:22:55 +01:00 · 2018-10-30 16:13:18 +01:00 · 2018-10-27 20:18:17 +02:00 · 2018-10-27 20:14:19 +02:00 · 2018-10-24 17:32:08 +02:00
88 changed files with 4452 additions and 1960 deletions
@@ -1,3 +1,41 @@
+# 70.0.3538.95
+* fix crash on bookmark edit activity (fixes https://github.com/bromite/bromite/issues/172)
+* fix slow chrome://flags (fixes https://github.com/bromite/bromite/issues/173)
+* enable TLS 1.3 final support by default (fixes https://github.com/bromite/bromite/issues/174)
+* dropped some patches related to GCM/GMS on suspicion of being related to random crashes
+
+# 70.0.3538.87
+* enable history requirement of user gesture (fixes https://github.com/bromite/bromite/issues/171)
+* enable serialization of scroll position changes while loading (fixes https://github.com/bromite/bromite/issues/171)
+* remove passwords keyboard accessory option (fixes https://github.com/bromite/bromite/issues/171)
+* some improvements to bookmark import/export interaction
+* add flag to disable orientation API, disabled by default
+* disable device motion API by default (fixes https://github.com/bromite/bromite/issues/171)
+
+# 70.0.3538.83
+* fix keep session cookies option showing on all site settings views
+* fix blank site settings entry showing (fixes https://github.com/bromite/bromite/issues/166)
+* offer builtin autocomplete for chrome://flags quick access
+
+# 70.0.3538.80
+* add flag to disable video resume functionality, allowing to not pause video playback on tab switch (fixes https://github.com/bromite/bromite/issues/108)
+* prevent "are you there" prompts from appearing when playing videos
+* completely disable update scheduler checks to fix a related crash
+
+# 70.0.3538.77
+* disable generic sensor APIs by default (fixes https://github.com/bromite/bromite/issues/160)
+* introduce flag to disable device motion API (fixes https://github.com/bromite/bromite/issues/160)
+* add Quad9 as a DNS-over-HTTPS (DoH) option (fixes https://github.com/bromite/bromite/issues/140)
+
+# 70.0.3538.71
+* fix bug with canvas fingerprinting (fixes https://github.com/bromite/bromite/issues/154)
+
+# 70.0.3538.67
+* re-enabled DNS-over-HTTPS (DoH) flag (fixes https://github.com/bromite/bromite/issues/139)
+* dropped GCM removal patch
+* disable kSigninAllowedOnNextStartup by default
+* permanently disable query-in-omnibox (fixes https://github.com/bromite/bromite/issues/143)
+
 # 69.0.3497.113
 * disabled DNS-over-HTTPS (DoH) flag, not working since 69.0.3497.73 (see https://github.com/bromite/bromite/issues/139)

@@ -70,17 +70,18 @@ Yes, since version 69. While the desktop version of Chromium has an option to di

 * baked-in adblock engine with filters from EasyList, EasyPrivacy and others
 * remove click-tracking and AMP from search results
-* DNS-over-HTTPS support via Google/CloudFlare servers
+* DNS-over-HTTPS support via Google, Cloudflare and Quad9 servers
 * [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
 * always-incognito mode
 * completely removed safe browsing and other privacy-unfriendly features
+* 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
-* canvas, audio and other anti-fingerprinting mitigations

 ## Features not related to privacy
 * import/export bookmarks
-* allow playing videos in background
+* allow playing videos in background tabs and disable pause on switching tabs
 * all codecs included (proprietary, open H.264 etc.)
 * built with official speed optimizations

@@ -136,6 +137,7 @@ Please refer to [official Chromium build documentation](https://www.chromium.org
 * [Brave Browser](https://github.com/brave/browser-android-tabs) for some patches
 * nochromo for the original adblock patch
 * [AdBlock Plus](https://adblockplus.org/), [uBlock Origin](https://github.com/uBlockOrigin), [Peter Lowe's adservers list](https://pgl.yoyo.org/adservers/), [EasyList and EasyPrivacy](https://easylist.to/) for the filters included
+* [Vadim Pleshkov](http://vadimpleshkov.me/) for Bromite's logo

 # License

@@ -3,22 +3,9 @@ Date: Thu, 22 Mar 2018 22:11:57 +0100
 Subject: Battery API: return nothing

 ---
- services/device/battery/battery_status_service.cc  |  2 +-
 .../renderer/modules/battery/battery_manager.cc    | 25 ++++------------------
- 2 files changed, 5 insertions(+), 22 deletions(-)
+ 1 file changed, 4 insertions(+), 21 deletions(-)

-diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
--- a/services/device/battery/battery_status_service.cc
-+++ b/services/device/battery/battery_status_service.cc
-@@ -41,7 +41,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
-   if (!battery_fetcher_)
-     battery_fetcher_ = BatteryStatusManager::Create(update_callback_);
- 
-#if 0
-+#if !defined(OS_ANDROID)
-   if (callback_list_.empty()) {
-     bool success = battery_fetcher_->StartListeningBatteryChange();
-     // On failure pass the default values back.
 diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
 --- a/third_party/blink/renderer/modules/battery/battery_manager.cc
 +++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
@@ -62,13 +49,13 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
 -    return;
 -
 -  if (battery_status_.Charging() != old_status.Charging())
-    DispatchEvent(Event::Create(EventTypeNames::chargingchange));
+-    DispatchEvent(*Event::Create(EventTypeNames::chargingchange));
 -  if (battery_status_.charging_time() != old_status.charging_time())
-    DispatchEvent(Event::Create(EventTypeNames::chargingtimechange));
+-    DispatchEvent(*Event::Create(EventTypeNames::chargingtimechange));
 -  if (battery_status_.discharging_time() != old_status.discharging_time())
-    DispatchEvent(Event::Create(EventTypeNames::dischargingtimechange));
+-    DispatchEvent(*Event::Create(EventTypeNames::dischargingtimechange));
 -  if (battery_status_.Level() != old_status.Level())
-    DispatchEvent(Event::Create(EventTypeNames::levelchange));
+-    DispatchEvent(*Event::Create(EventTypeNames::levelchange));
 }
 
 void BatteryManager::RegisterWithDispatcher() {
@@ -10,7 +10,7 @@ Disable all omissions (already shadowed by first flag)
 diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -407,12 +407,12 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
+@@ -412,12 +412,12 @@ IDNConversionStatus IDNToUnicodeOneComponent(const base::char16* comp,
 }  // namespace
 
 const FormatUrlType kFormatUrlOmitNothing = 0;
@@ -14,11 +14,12 @@ Subject: Modify default preferences
 chrome/browser/ui/navigation_correction_tab_observer.cc           | 2 +-
 chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc     | 4 ----
 chrome/service/cloud_print/connector_settings.cc                  | 2 +-
- components/autofill/core/browser/autofill_manager.cc              | 2 +-
+ components/autofill/core/browser/autofill_manager.cc              | 5 +----
+ components/autofill/core/common/autofill_prefs.cc                 | 6 +++---
 components/bookmarks/browser/bookmark_utils.cc                    | 4 ++--
 components/safe_browsing/common/safe_browsing_prefs.cc            | 4 ++--
 extensions/common/extension.cc                                    | 8 --------
- 15 files changed, 17 insertions(+), 29 deletions(-)
+ 16 files changed, 20 insertions(+), 35 deletions(-)

 diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
 --- a/chrome/browser/background/background_mode_manager.cc
@@ -35,7 +36,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1053,7 +1053,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1041,7 +1041,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
 void ChromeContentBrowserClient::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -109,7 +110,7 @@ diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signi
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -70,11 +70,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -68,11 +68,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
   registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
   registry->RegisterBooleanPref(
@@ -126,7 +127,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc
 --- a/chrome/browser/ui/navigation_correction_tab_observer.cc
 +++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
-@@ -58,7 +58,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
+@@ -56,7 +56,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
 void NavigationCorrectionTabObserver::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* prefs) {
   prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
@@ -164,15 +165,43 @@ diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/c
 diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -189,7 +189,7 @@ void AutofillManager::RegisterProfilePrefs(
-   registry->RegisterIntegerPref(
-       prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
+@@ -288,10 +288,7 @@ bool AutofillManager::ShouldShowCreditCardSigninPromo(
+ bool AutofillManager::ShouldParseForms(const std::vector<FormData>& forms,
+                                        const base::TimeTicks timestamp) {
+   bool enabled = IsAutofillEnabled();
+-  if (!has_logged_autofill_enabled_) {
+-    AutofillMetrics::LogIsAutofillEnabledAtPageLoad(enabled);
+-    has_logged_autofill_enabled_ = true;
+-  }
+  has_logged_autofill_enabled_ = true;
+ 
+   return enabled;
+ }
+diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc
+--- a/components/autofill/core/common/autofill_prefs.cc
+++ b/components/autofill/core/common/autofill_prefs.cc
+@@ -75,10 +75,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+       prefs::kAutofillBillingCustomerNumber, 0.0,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
   registry->RegisterBooleanPref(
-      prefs::kAutofillEnabled, true,
-+      prefs::kAutofillEnabled, false,
+-      prefs::kAutofillEnabledDeprecated, true,
+      prefs::kAutofillEnabledDeprecated, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
-       prefs::kAutofillProfileEnabled, true,
+-      prefs::kAutofillProfileEnabled, true,
+      prefs::kAutofillProfileEnabled, false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterIntegerPref(
+       prefs::kAutofillLastVersionDeduped, 0,
+@@ -87,7 +87,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+       prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterBooleanPref(
+-      prefs::kAutofillCreditCardEnabled, true,
+      prefs::kAutofillCreditCardEnabled, false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterStringPref(
+       prefs::kAutofillProfileValidity, "",
 diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
 --- a/components/bookmarks/browser/bookmark_utils.cc
 +++ b/components/bookmarks/browser/bookmark_utils.cc
@@ -194,7 +223,7 @@ diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmar
 diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components/safe_browsing/common/safe_browsing_prefs.cc
 --- a/components/safe_browsing/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/common/safe_browsing_prefs.cc
-@@ -278,9 +278,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -282,9 +282,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(
       prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
   registry->RegisterBooleanPref(
@@ -9,7 +9,7 @@ Subject: Do not store passwords by default
 diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -278,10 +278,10 @@ bool ShouldPromptUserToSavePassword(const PasswordFormManager& manager) {
+@@ -266,10 +266,10 @@ bool IsThereVisiblePasswordField(const FormData& form) {
 void PasswordManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -9,7 +9,7 @@ Subject: Disable NTP remote suggestions by default
 diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/features.cc
 --- a/components/ntp_snippets/features.cc
 +++ b/components/ntp_snippets/features.cc
-@@ -38,13 +38,13 @@ const base::Feature kArticleSuggestionsExpandableHeader{
+@@ -39,13 +39,13 @@ const base::Feature kArticleSuggestionsExpandableHeader{
     "NTPArticleSuggestionsExpandableHeader", base::FEATURE_ENABLED_BY_DEFAULT};
 
 const base::Feature kArticleSuggestionsFeature{
@@ -9,7 +9,7 @@ Subject: Disable WebRTC by default
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -87,10 +87,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -85,10 +85,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
                                 false);
 #endif
   // TODO(guoweis): Remove next 2 options at M50.
@@ -21,8 +21,8 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 -                               content::kWebRTCIPHandlingDefault);
 +                               content::kWebRTCIPHandlingDisableNonProxiedUdp);
   registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
+   registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
 
-   // Dictionaries to keep track of default tasks in the file browser.
 -- 
 2.11.0

@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
-@@ -150,6 +150,7 @@ public class DataReductionProxySettings {
+@@ -153,6 +153,7 @@ public class DataReductionProxySettings {
         // DataReductionProxySettings is a singleton that lives forever and there's no clean
         // shutdown of Chrome on Android
         mNativeDataReductionProxySettings = nativeInit();
@@ -30,7 +30,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/D
     }
 
     /** Returns true if the SPDY proxy promo is allowed to be shown. */
-@@ -172,6 +173,7 @@ public class DataReductionProxySettings {
+@@ -175,6 +176,7 @@ public class DataReductionProxySettings {
      * data reduction statistics if this is the first time the SPDY proxy has been enabled.
      */
     public void setDataReductionProxyEnabled(Context context, boolean enabled) {
@@ -217,7 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
     }
 
     // TemplateUrlService.LoadListener implementation.
-@@ -279,9 +279,11 @@ public class MainPreferences extends PreferenceFragment
+@@ -280,9 +280,11 @@ public class MainPreferences extends PreferenceFragment
                 if (PREF_SAVED_PASSWORDS.equals(preference.getKey())) {
                     return PrefServiceBridge.getInstance().isRememberPasswordsManaged();
                 }
@@ -229,7 +229,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
                 if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
                     return TemplateUrlService.getInstance().isDefaultSearchManaged();
                 }
-@@ -299,11 +301,13 @@ public class MainPreferences extends PreferenceFragment
+@@ -304,11 +306,13 @@ public class MainPreferences extends PreferenceFragment
                     return prefs.isRememberPasswordsManaged()
                             && !prefs.isRememberPasswordsEnabled();
                 }
@@ -9,7 +9,7 @@ Subject: Disable signin/data reduction promos
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -575,7 +575,7 @@ public class ChromeTabbedActivity
+@@ -601,7 +601,7 @@ public class ChromeTabbedActivity
             // TODO(tedchoc): Unify promo dialog logic as the search engine promo dialog checks
             //                might not have completed at this point and we could show multiple
             //                promos.
@@ -18,8 +18,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
             // Promo dialogs in multiwindow mode are broken on some devices: http://crbug.com/354696
             boolean isLegacyMultiWindow = MultiWindowUtils.getInstance().isLegacyMultiWindow(this);
             if (!isShowingPromo && !mIntentWithEffect && FirstRunStatus.getFirstRunFlowComplete()
-@@ -595,7 +595,7 @@ public class ChromeTabbedActivity
-                 preferenceManager.setPromosSkippedOnFirstStart(true);
+@@ -619,7 +619,7 @@ public class ChromeTabbedActivity
+                         ChromePreferenceManager.PROMOS_SKIPPED_ON_FIRST_START, true);
             }
 
 -            if (!isShowingPromo) {
@@ -3,14 +3,14 @@ Date: Wed, 22 Mar 2017 19:10:30 -0400
 Subject: Remove Sync and Translate menu

 ---
- .../java/res/drawable-hdpi/settings_translate.png        | Bin 399 -> 0 bytes
- .../java/res/drawable-mdpi/settings_translate.png        | Bin 284 -> 0 bytes
- .../java/res/drawable-xhdpi/settings_translate.png       | Bin 547 -> 0 bytes
- .../java/res/drawable-xxhdpi/settings_translate.png      | Bin 793 -> 0 bytes
- .../java/res/drawable-xxxhdpi/settings_translate.png     | Bin 1038 -> 0 bytes
- .../android/java/res/xml/site_settings_preferences.xml   |   4 ++--
- .../preferences/website/SiteSettingsPreferences.java     |  14 +++++++-------
- 7 files changed, 9 insertions(+), 9 deletions(-)
+ .../java/res/drawable-hdpi/settings_translate.png  | Bin 399 -> 0 bytes
+ .../java/res/drawable-mdpi/settings_translate.png  | Bin 284 -> 0 bytes
+ .../java/res/drawable-xhdpi/settings_translate.png | Bin 547 -> 0 bytes
+ .../res/drawable-xxhdpi/settings_translate.png     | Bin 793 -> 0 bytes
+ .../res/drawable-xxxhdpi/settings_translate.png    | Bin 1038 -> 0 bytes
+ .../java/res/xml/site_settings_preferences.xml     |   8 +++----
+ .../website/SiteSettingsPreferences.java           |  23 +++------------------
+ 7 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 chrome/android/java/res/drawable-hdpi/settings_translate.png
 delete mode 100644 chrome/android/java/res/drawable-mdpi/settings_translate.png
 delete mode 100644 chrome/android/java/res/drawable-xhdpi/settings_translate.png
@@ -33,9 +33,21 @@ diff --git a/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png b/c
 deleted file mode 100644
 index 058b50b84dd216d983e9dea2ea264b39773ac318..0000000000000000000000000000000000000000
 diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/android/java/res/xml/site_settings_preferences.xml
-index 81658269058c..346cdce944c6 100644
+index 81658269058c..518be48cb3c5 100644
 --- a/chrome/android/java/res/xml/site_settings_preferences.xml
 +++ b/chrome/android/java/res/xml/site_settings_preferences.xml
+@@ -50,9 +50,9 @@
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+         android:key="ads" />
+     <!-- Background sync -->
+-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <!-- org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+-        android:key="background_sync" />
+        android:key="background_sync" /-->
+     <!-- Protected content -->
+     <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
@@ -73,11 +73,11 @@
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
         android:key="sound" />
@@ -51,43 +63,56 @@ index 81658269058c..346cdce944c6 100644
     <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. -->
     <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
-index bf12a5cab122..e3cc3d118294 100644
+index 1274fd3c7118..57b29816fd96 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
-@@ -89,7 +89,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
+@@ -38,7 +38,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
+     // are defined in the SiteSettingsCategory, additional keys
+     // are listed here.
+     static final String MEDIA_KEY = "media";
+-    static final String TRANSLATE_KEY = "translate";
+ 
+     // Whether the Protected Content menu is available for display.
+     boolean mProtectedContentMenuAvailable;
+@@ -84,12 +83,12 @@ public class SiteSettingsPreferences extends PreferenceFragment
+             for (@SiteSettingsCategory.Type int i = 0; i < SiteSettingsCategory.Type.NUM_ENTRIES;
+                     i++) {
+                 if (i == SiteSettingsCategory.Type.AUTOPLAY
+-                        || i == SiteSettingsCategory.Type.PROTECTED_MEDIA)
+                        || i == SiteSettingsCategory.Type.PROTECTED_MEDIA
+                        || i == SiteSettingsCategory.Type.BACKGROUND_SYNC)
+                     continue;
                 getPreferenceScreen().removePreference(findPreference(i));
             }
             getPreferenceScreen().removePreference(findPreference(MEDIA_KEY));
 -            getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
-+//            getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
         } else {
             // If both Autoplay and Protected Content menus are available, they'll be tucked under
             // the Media key. Otherwise, we can remove the Media menu entry.
-@@ -118,9 +118,9 @@ public class SiteSettingsPreferences extends PreferenceFragment
+@@ -116,11 +115,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
+                 getPreferenceScreen().removePreference(
+                         findPreference(SiteSettingsCategory.Type.CLIPBOARD));
             }
-             // The new Languages Preference *feature* is an advanced version of this translate
-             // preference. Once Languages Preference is enabled, remove this setting.
+-            // The new Languages Preference *feature* is an advanced version of this translate
+-            // preference. Once Languages Preference is enabled, remove this setting.
 -            if (ChromeFeatureList.isEnabled(ChromeFeatureList.LANGUAGES_PREFERENCE)) {
 -                getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
 -            }
-+//            if (ChromeFeatureList.isEnabled(ChromeFeatureList.LANGUAGES_PREFERENCE)) {
-+//                getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
-+//            }
             if (!ChromeFeatureList.isEnabled(ChromeFeatureList.GENERIC_SENSOR_EXTRA_CLASSES)) {
                 getPreferenceScreen().removePreference(
                         findPreference(SiteSettingsCategory.Type.SENSORS));
-@@ -132,8 +132,8 @@ public class SiteSettingsPreferences extends PreferenceFragment
+@@ -131,10 +125,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
+     private void updatePreferenceStates() {
         PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
 
-         // Translate preference.
+-        // Translate preference.
 -        Preference translatePref = findPreference(TRANSLATE_KEY);
 -        if (translatePref != null) setTranslateStateSummary(translatePref);
-+//        Preference translatePref = findPreference(TRANSLATE_KEY);
-+//        if (translatePref != null) setTranslateStateSummary(translatePref);
- 
+-
         // Preferences that navigate to Website Settings.
         List<Integer> websitePrefs = new ArrayList<Integer>();
-@@ -149,7 +149,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
+         if (mMediaSubMenu) {
+@@ -149,7 +139,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
             if (!mProtectedContentMenuAvailable) {
                 websitePrefs.add(SiteSettingsCategory.Type.AUTOPLAY);
             }
@@ -96,6 +121,18 @@ index bf12a5cab122..e3cc3d118294 100644
             websitePrefs.add(SiteSettingsCategory.Type.CAMERA);
             if (ChromeFeatureList.isEnabled(ChromeFeatureList.CLIPBOARD_CONTENT_SETTING)) {
                 websitePrefs.add(SiteSettingsCategory.Type.CLIPBOARD);
+@@ -247,11 +237,4 @@ public class SiteSettingsPreferences extends PreferenceFragment
+                 preference.getTitle().toString());
+         return false;
+     }
+-
+-    private void setTranslateStateSummary(Preference translatePref) {
+-        boolean translateEnabled = PrefServiceBridge.getInstance().isTranslateEnabled();
+-        translatePref.setSummary(translateEnabled
+-                ? R.string.website_settings_category_ask
+-                : R.string.website_settings_category_blocked);
+-    }
+ }
 -- 
 2.11.0

@@ -9,7 +9,7 @@ Subject: Never send any crash upload data
 diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/tracing/crash_service_uploader.cc
 --- a/chrome/browser/tracing/crash_service_uploader.cc
 +++ b/chrome/browser/tracing/crash_service_uploader.cc
-@@ -122,6 +122,9 @@ void TraceCrashServiceUploader::DoUpload(
+@@ -126,6 +126,9 @@ void TraceCrashServiceUploader::DoUpload(
     std::unique_ptr<const base::DictionaryValue> metadata,
     const UploadProgressCallback& progress_callback,
     UploadDoneCallback done_callback) {
@@ -10,7 +10,7 @@ Subject: ungoogled-chromium: Disable signin
 diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
 --- a/chrome/browser/ui/chrome_pages.cc
 +++ b/chrome/browser/ui/chrome_pages.cc
-@@ -72,12 +72,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) {
+@@ -71,12 +71,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) {
   ShowSingletonTabOverwritingNTP(browser, std::move(params));
 }
 
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.
 // Shows either the help app or the appropriate help page for |source|. If
 // |browser| is NULL and the help page is used (vs the app), the help page is
 // shown in the last active browser. If there is no such browser, a new browser
-@@ -384,6 +378,7 @@ void ShowSearchEngineSettings(Browser* browser) {
+@@ -383,6 +377,7 @@ void ShowSearchEngineSettings(Browser* browser) {
 #if !defined(OS_ANDROID)
 void ShowBrowserSignin(Browser* browser,
                        signin_metrics::AccessPoint access_point) {
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.
   Profile* original_profile = browser->profile()->GetOriginalProfile();
   SigninManagerBase* manager =
       SigninManagerFactory::GetForProfile(original_profile);
-@@ -435,6 +430,7 @@ void ShowBrowserSignin(Browser* browser,
+@@ -434,6 +429,7 @@ void ShowBrowserSignin(Browser* browser,
                                                   access_point);
 #endif
   }
@@ -42,7 +42,7 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.
 diff --git a/components/signin/core/browser/signin_manager_base.cc b/components/signin/core/browser/signin_manager_base.cc
 --- a/components/signin/core/browser/signin_manager_base.cc
 +++ b/components/signin/core/browser/signin_manager_base.cc
-@@ -158,7 +158,7 @@ void SigninManagerBase::Initialize(PrefService* local_state) {
+@@ -155,7 +155,7 @@ void SigninManagerBase::Initialize(PrefService* local_state) {
 bool SigninManagerBase::IsInitialized() const { return initialized_; }
 
 bool SigninManagerBase::IsSigninAllowed() const {
@@ -28,7 +28,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser
 -    WriteCompressedLogToFile(compressed_log, log_file_path);
 -
 -    base::FilePath log_list_path =
-        webrtc_logging::LogList::GetWebRtcLogListFileForDirectory(
+-        webrtc_logging::TextLogList::GetWebRtcLogListFileForDirectory(
 -            upload_done_data.log_path);
 -    AddLocallyStoredLogInfoToUploadListFile(log_list_path, local_log_id);
 -  }
@@ -91,7 +91,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_model_loader.h b/chrome/br
 diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
 --- a/rlz/lib/financial_ping.cc
 +++ b/rlz/lib/financial_ping.cc
-@@ -350,7 +350,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request,
+@@ -339,7 +339,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request,
 
   // Open network connection.
   InternetHandle connection_handle = InternetConnectA(inet_handle,
@@ -100,7 +100,7 @@ diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
       INTERNET_FLAG_NO_CACHE_WRITE, 0);
   if (!connection_handle)
     return PING_FAILURE;
-@@ -394,7 +394,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request,
+@@ -383,7 +383,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request,
   return PING_SUCCESSFUL;
 #else
   std::string url =
@@ -40,7 +40,7 @@ diff --git a/components/translate/core/browser/translate_manager.cc b/components
 diff --git a/components/translate/core/browser/translate_script.cc b/components/translate/core/browser/translate_script.cc
 --- a/components/translate/core/browser/translate_script.cc
 +++ b/components/translate/core/browser/translate_script.cc
-@@ -152,9 +152,8 @@ void TranslateScript::OnScriptFetchComplete(bool success,
+@@ -154,9 +154,8 @@ void TranslateScript::OnScriptFetchComplete(bool success,
     base::StringAppendF(&data_, "var serverParams = '%s';\n",
                         server_params.c_str());
 
@@ -49,7 +49,7 @@ diff --git a/components/translate/core/browser/translate_script.cc b/components/
 -        &data_, "var securityOrigin = '%s';", security_origin.spec().c_str());
 +        &data_, "var securityOrigin = '';");
 
-     // Append embedded translate.js and a remote element library.
+     // Load embedded translate.js.
     base::StringPiece str =
 -- 
 2.11.0
@@ -2,10 +2,49 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Mon, 12 Feb 2018 21:29:30 +0100
 Subject: ungoogled-chromium: Disable profile avatar downloading

+Added some Bromite-specific further improvements
 ---
- chrome/browser/profiles/profile_avatar_downloader.cc | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
+ chrome/browser/BUILD.gn                              |  2 --
+ chrome/browser/profiles/profile_attributes_entry.cc  | 14 --------------
+ chrome/browser/profiles/profile_avatar_downloader.cc |  8 +-------
+ 3 files changed, 1 insertion(+), 23 deletions(-)

+diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
+--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
+@@ -1253,8 +1253,6 @@ jumbo_split_static_library("browser") {
+     "profiles/profile_attributes_entry.h",
+     "profiles/profile_attributes_storage.cc",
+     "profiles/profile_attributes_storage.h",
+-    "profiles/profile_avatar_downloader.cc",
+-    "profiles/profile_avatar_downloader.h",
+     "profiles/profile_avatar_icon_util.cc",
+     "profiles/profile_avatar_icon_util.h",
+     "profiles/profile_destroyer.cc",
+diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc
+--- a/chrome/browser/profiles/profile_attributes_entry.cc
+++ b/chrome/browser/profiles/profile_attributes_entry.cc
+@@ -83,20 +83,6 @@ base::string16 ProfileAttributesEntry::GetUserName() const {
+ }
+ 
+ const gfx::Image& ProfileAttributesEntry::GetAvatarIcon() const {
+-  if (IsUsingGAIAPicture()) {
+-    const gfx::Image* image = GetGAIAPicture();
+-    if (image)
+-      return *image;
+-  }
+-
+-#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+-  // Use the high resolution version of the avatar if it exists. Mobile and
+-  // ChromeOS don't need the high resolution version so no need to fetch it.
+-  const gfx::Image* image = GetHighResAvatar();
+-  if (image)
+-    return *image;
+-#endif
+-
+   int resource_id =
+       profiles::GetDefaultAvatarIconResourceIDAtIndex(GetAvatarIconIndex());
+   return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
 diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/browser/profiles/profile_avatar_downloader.cc
 --- a/chrome/browser/profiles/profile_avatar_downloader.cc
 +++ b/chrome/browser/profiles/profile_avatar_downloader.cc
@@ -12,7 +12,7 @@ See this page for more information: https://mikewest.org/2012/02/chrome-connects
 diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
 --- a/chrome/browser/intranet_redirect_detector.cc
 +++ b/chrome/browser/intranet_redirect_detector.cc
-@@ -77,9 +77,7 @@ void IntranetRedirectDetector::FinishSleep() {
+@@ -76,9 +76,7 @@ void IntranetRedirectDetector::FinishSleep() {
   simple_loaders_.clear();
   resulting_origins_.clear();
 
@@ -5,11 +5,11 @@ Subject: ungoogled-chromium: Disable Google host detection
 Disables various detections of Google hosts and functionality specific to them
 ---
 .../page_load_metrics/page_load_metrics_util.cc    |   4 +-
- .../page_load_metrics/page_load_metrics_util.cc    |  33 +----
- components/google/core/browser/google_util.cc      | 138 +++++----------------
+ .../page_load_metrics/page_load_metrics_util.cc    |  33 +---
+ components/google/core/common/google_util.cc       | 194 ++-------------------
 components/search_engines/template_url.cc          |   6 +-
- net/base/url_util.cc                               |  22 ----
- 5 files changed, 31 insertions(+), 172 deletions(-)
+ net/base/url_util.cc                               |  22 ---
+ 5 files changed, 14 insertions(+), 245 deletions(-)

 diff --git a/chrome/browser/page_load_metrics/page_load_metrics_util.cc b/chrome/browser/page_load_metrics/page_load_metrics_util.cc
 --- a/chrome/browser/page_load_metrics/page_load_metrics_util.cc
@@ -68,10 +68,10 @@ diff --git a/chrome/common/page_load_metrics/page_load_metrics_util.cc b/chrome/
 }
 
 bool IsGoogleHostname(const GURL& url) {
-diff --git a/components/google/core/browser/google_util.cc b/components/google/core/browser/google_util.cc
--- a/components/google/core/browser/google_util.cc
-+++ b/components/google/core/browser/google_util.cc
-@@ -41,118 +41,16 @@ namespace {
+diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc
+--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
+@@ -42,118 +42,16 @@ namespace {
 
 bool gUseMockLinkDoctorBaseURLForTesting = false;
 
@@ -191,62 +191,72 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
 }
 
 void SetMockLinkDoctorBaseURLForTesting() {
-@@ -166,11 +64,11 @@ std::string GetGoogleLocale(const std::string& application_locale) {
+@@ -167,120 +65,50 @@ std::string GetGoogleLocale(const std::string& application_locale) {
 
 GURL AppendGoogleLocaleParam(const GURL& url,
                              const std::string& application_locale) {
-  return net::AppendQueryParameter(
-      url, "hl", GetGoogleLocale(application_locale));
+-  return net::AppendQueryParameter(url, "hl",
+-                                   GetGoogleLocale(application_locale));
 +  return url;
 }
 
 std::string GetGoogleCountryCode(const GURL& google_homepage_url) {
-+#if 0
-   base::StringPiece google_hostname = google_homepage_url.host_piece();
-   // TODO(igorcov): This needs a fix for case when the host has a trailing dot,
-   // like "google.com./". https://crbug.com/720295.
-@@ -190,18 +88,24 @@ std::string GetGoogleCountryCode(const GURL& google_homepage_url) {
-   if (country_code == "cat")
-     return "es";
-   return country_code.as_string();
-+#endif
+-  base::StringPiece google_hostname = google_homepage_url.host_piece();
+-  // TODO(igorcov): This needs a fix for case when the host has a trailing dot,
+-  // like "google.com./". https://crbug.com/720295.
+-  const size_t last_dot = google_hostname.find_last_of('.');
+-  if (last_dot == std::string::npos)
+-    return std::string();
+-  base::StringPiece country_code = google_hostname.substr(last_dot + 1);
+-  // Assume the com TLD implies the US.
+-  if (country_code == "com")
+-    return "us";
+-  // Google uses the Unicode Common Locale Data Repository (CLDR), and the CLDR
+-  // code for the UK is "gb".
+-  if (country_code == "uk")
+-    return "gb";
+-  // Catalonia does not have a CLDR country code, since it's a region in Spain,
+-  // so use Spain instead.
+-  if (country_code == "cat")
+-    return "es";
+-  return country_code.as_string();
 +  return "nolocale";
 }
 
 GURL GetGoogleSearchURL(const GURL& google_homepage_url) {
-+#if 0
-   // To transform the homepage URL into the corresponding search URL, add the
-   // "search" and the "q=" query string.
-   GURL::Replacements replacements;
-   replacements.SetPathStr("search");
-   replacements.SetQueryStr("q=");
-   return google_homepage_url.ReplaceComponents(replacements);
-+#endif
+-  // To transform the homepage URL into the corresponding search URL, add the
+-  // "search" and the "q=" query string.
+-  GURL::Replacements replacements;
+-  replacements.SetPathStr("search");
+-  replacements.SetQueryStr("q=");
+-  return google_homepage_url.ReplaceComponents(replacements);
 +  return google_homepage_url;
 }
 
 const GURL& CommandLineGoogleBaseURL() {
-+#if 0
-   // Unit tests may add command-line flags after the first call to this
-   // function, so we don't simply initialize a static |base_url| directly and
-   // then unconditionally return it.
-@@ -216,31 +120,35 @@ const GURL& CommandLineGoogleBaseURL() {
-     if (!base_url.is_valid() || base_url.has_query() || base_url.has_ref())
-       base_url = GURL();
-   }
-+#endif
-+  CR_DEFINE_STATIC_LOCAL(GURL, base_url, ());
+-  // Unit tests may add command-line flags after the first call to this
+-  // function, so we don't simply initialize a static |base_url| directly and
+-  // then unconditionally return it.
+-  CR_DEFINE_STATIC_LOCAL(std::string, switch_value, ());
+   CR_DEFINE_STATIC_LOCAL(GURL, base_url, ());
+-  std::string current_switch_value(
+-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+-          switches::kGoogleBaseURL));
+-  if (current_switch_value != switch_value) {
+-    switch_value = current_switch_value;
+-    base_url = url_formatter::FixupURL(switch_value, std::string());
+-    if (!base_url.is_valid() || base_url.has_query() || base_url.has_ref())
+-      base_url = GURL();
+-  }
 +  base_url = GURL();
   return base_url;
 }
 
 bool StartsWithCommandLineGoogleBaseURL(const GURL& url) {
-+#if 0
-   const GURL& base_url(CommandLineGoogleBaseURL());
-   return base_url.is_valid() &&
-          base::StartsWith(url.possibly_invalid_spec(), base_url.spec(),
-                           base::CompareCase::SENSITIVE);
-+#endif
+-  const GURL& base_url(CommandLineGoogleBaseURL());
+-  return base_url.is_valid() &&
+-         base::StartsWith(url.possibly_invalid_spec(), base_url.spec(),
+-                          base::CompareCase::SENSITIVE);
 +  return false;
 }
 
@@ -267,41 +277,47 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
 }
 
 bool IsGoogleHomePageUrl(const GURL& url) {
-+#if 0
-   // First check to see if this has a Google domain.
-   if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
-                          DISALLOW_NON_STANDARD_PORTS) &&
-@@ -252,9 +160,13 @@ bool IsGoogleHomePageUrl(const GURL& url) {
-   base::StringPiece path(url.path_piece());
-   return IsPathHomePageBase(path) ||
-          base::StartsWith(path, "/ig", base::CompareCase::INSENSITIVE_ASCII);
-+#else
+-  // First check to see if this has a Google domain.
+-  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
+-                         DISALLOW_NON_STANDARD_PORTS) &&
+-      !IsGoogleSearchSubdomainUrl(url)) {
+-    return false;
+-  }
+-
+-  // Make sure the path is a known home page path.
+-  base::StringPiece path(url.path_piece());
+-  return IsPathHomePageBase(path) ||
+-         base::StartsWith(path, "/ig", base::CompareCase::INSENSITIVE_ASCII);
 +  return false;
-+#endif
 }
 
 bool IsGoogleSearchUrl(const GURL& url) {
-+#if 0
-   // First check to see if this has a Google domain.
-   if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
-                          DISALLOW_NON_STANDARD_PORTS) &&
-@@ -272,14 +184,20 @@ bool IsGoogleSearchUrl(const GURL& url) {
-   // the path type.
-   return HasGoogleSearchQueryParam(url.ref_piece()) ||
-       (!is_home_page_base && HasGoogleSearchQueryParam(url.query_piece()));
-+#else
+-  // First check to see if this has a Google domain.
+-  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
+-                         DISALLOW_NON_STANDARD_PORTS) &&
+-      !IsGoogleSearchSubdomainUrl(url)) {
+-    return false;
+-  }
+-
+-  // Make sure the path is a known search path.
+-  base::StringPiece path(url.path_piece());
+-  bool is_home_page_base = IsPathHomePageBase(path);
+-  if (!is_home_page_base && (path != "/search"))
+-    return false;
+-
+-  // Check for query parameter in URL parameter and hash fragment, depending on
+-  // the path type.
+-  return HasGoogleSearchQueryParam(url.ref_piece()) ||
+-         (!is_home_page_base && HasGoogleSearchQueryParam(url.query_piece()));
 +  return false;
-+#endif
 }
 
 bool IsYoutubeDomainUrl(const GURL& url,
                         SubdomainPermission subdomain_permission,
                         PortPermission port_permission) {
-+#if 0
-   return IsValidURL(url, port_permission) &&
-       IsValidHostName(url.host_piece(), "youtube", subdomain_permission,
-                       nullptr);
-+#endif
+-  return IsValidURL(url, port_permission) &&
+-         IsValidHostName(url.host_piece(), "youtube", subdomain_permission,
+-                         nullptr);
 +  return false;
 }
 
@@ -309,7 +325,7 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
 diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
 --- a/components/search_engines/template_url.cc
 +++ b/components/search_engines/template_url.cc
-@@ -499,11 +499,7 @@ base::string16 TemplateURLRef::SearchTermToString16(
+@@ -505,11 +505,7 @@ base::string16 TemplateURLRef::SearchTermToString16(
 bool TemplateURLRef::HasGoogleBaseURLs(
     const SearchTermsData& search_terms_data) const {
   ParseIfNecessary(search_terms_data);
@@ -10,7 +10,7 @@ Disable Google Cloud Messaging (GCM) client
 diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc
 --- a/components/gcm_driver/gcm_client_impl.cc
 +++ b/components/gcm_driver/gcm_client_impl.cc
-@@ -491,6 +491,7 @@ void GCMClientImpl::StartGCM() {
+@@ -493,6 +493,7 @@ void GCMClientImpl::StartGCM() {
 }
 
 void GCMClientImpl::InitializeMCSClient() {
@@ -18,7 +18,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc
   std::vector<GURL> endpoints;
   endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
   GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
-@@ -684,6 +685,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) {
+@@ -686,6 +687,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) {
 }
 
 void GCMClientImpl::StartCheckin() {
@@ -26,7 +26,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc
   // Make sure no checkin is in progress.
   if (checkin_request_)
     return;
-@@ -759,6 +761,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) {
+@@ -761,6 +763,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) {
 }
 
 void GCMClientImpl::SchedulePeriodicCheckin() {
@@ -18,7 +18,7 @@ See also: https://github.com/Eloston/ungoogled-chromium/issues/104
 diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -303,7 +303,6 @@
+@@ -312,7 +312,6 @@
       <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
       <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" flattenhtml="true" type="BINDATA" />
       <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_login.js" flattenhtml="true" type="BINDATA" />
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou
       <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flattenhtml="true" type="BINDATA" />
       <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
       <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flattenhtml="true" type="BINDATA" />
-@@ -444,7 +443,6 @@
+@@ -453,7 +452,6 @@
       <include name="IDR_WEBRTC_LOGS_JS" file="resources\media\webrtc_logs.js" type="BINDATA" />
       <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifest.json" type="BINDATA" />
       <include name="IDR_CRYPTOTOKEN_MANIFEST" file="resources\cryptotoken\manifest.json" type="BINDATA" />
@@ -91,16 +91,16 @@ diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/
 diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc
 --- a/google_apis/gaia/gaia_auth_fetcher.cc
 +++ b/google_apis/gaia/gaia_auth_fetcher.cc
-@@ -39,7 +39,7 @@ namespace {
+@@ -44,7 +44,7 @@ namespace {
 const int kLoadFlagsIgnoreCookies = net::LOAD_DO_NOT_SEND_COOKIES |
                                     net::LOAD_DO_NOT_SAVE_COOKIES;
 
 -const size_t kMaxMessageSize = 1024 * 1024;  // 1MB
 +//const size_t kMaxMessageSize = 1024 * 1024;  // 1MB
 
- static bool CookiePartsContains(const std::vector<std::string>& parts,
-                                 const char* part) {
-@@ -251,6 +251,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
+ bool CookiePartsContains(const std::vector<std::string>& parts,
+                          const char* part) {
+@@ -262,6 +262,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
     const net::NetworkTrafficAnnotationTag& traffic_annotation) {
   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
 
@@ -108,7 +108,7 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_
   auto resource_request = std::make_unique<network::ResourceRequest>();
   resource_request->url = gaia_gurl;
   original_url_ = gaia_gurl;
-@@ -299,6 +300,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
+@@ -310,6 +311,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
       base::BindOnce(&GaiaAuthFetcher::OnURLLoadComplete,
                      base::Unretained(this)),
       kMaxMessageSize);
@@ -17,7 +17,7 @@ Related comment: https://bugs.chromium.org/p/chromium/issues/detail?id=710701#c1
 diff --git a/third_party/blink/renderer/devtools/BUILD.gn b/third_party/blink/renderer/devtools/BUILD.gn
 --- a/third_party/blink/renderer/devtools/BUILD.gn
 +++ b/third_party/blink/renderer/devtools/BUILD.gn
-@@ -1147,10 +1147,8 @@ action("generate_devtools_grd") {
+@@ -1150,10 +1150,8 @@ action("generate_devtools_grd") {
       devtools_embedder_scripts +
       [ "$resources_out_dir/devtools_extension_api.js" ]
 
@@ -44,16 +44,16 @@ diff --git a/third_party/blink/renderer/devtools/front_end/audits2_worker.json b
 diff --git a/third_party/blink/renderer/devtools/front_end/devtools_app.json b/third_party/blink/renderer/devtools/front_end/devtools_app.json
 --- a/third_party/blink/renderer/devtools/front_end/devtools_app.json
 +++ b/third_party/blink/renderer/devtools/front_end/devtools_app.json
-@@ -5,7 +5,7 @@
+@@ -4,7 +4,7 @@
+     { "name": "inspector_main", "type": "autostart" },
     { "name": "mobile_throttling", "type": "autostart" },
-     { "name": "browser_components", "type": "autostart" },
 
 -    { "name": "accessibility", "type": "remote" },
 +    { "name": "accessibility" },
     { "name": "animation" },
     { "name": "audits2" },
     { "name": "browser_console" },
-@@ -13,14 +13,14 @@
+@@ -12,14 +12,14 @@
     { "name": "cookie_table" },
     { "name": "devices" },
     { "name": "elements" },
@@ -94,7 +94,7 @@ diff --git a/third_party/blink/renderer/devtools/front_end/shell.json b/third_pa
 diff --git a/third_party/blink/renderer/devtools/front_end/worker_app.json b/third_party/blink/renderer/devtools/front_end/worker_app.json
 --- a/third_party/blink/renderer/devtools/front_end/worker_app.json
 +++ b/third_party/blink/renderer/devtools/front_end/worker_app.json
-@@ -12,7 +12,7 @@
+@@ -11,7 +11,7 @@
     { "name": "help" },
     { "name": "layer_viewer" },
     { "name": "network" },
@@ -0,0 +1,33 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 27 Oct 2018 17:54:01 +0200
+Subject: Disable update scheduler
+
+---
+ .../chromium/chrome/browser/component_updater/UpdateScheduler.java | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java b/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
+@@ -35,10 +35,7 @@ public class UpdateScheduler {
+ 
+     @CalledByNative
+     /* package */ static boolean isAvailable() {
+-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+-                || GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
+-                           ContextUtils.getApplicationContext())
+-                == ConnectionResult.SUCCESS;
+        return false;
+     }
+ 
+     /* package */ void onStartTaskBeforeNativeLoaded(TaskFinishedCallback callback) {
+@@ -108,4 +105,4 @@ public class UpdateScheduler {
+ 
+     private native void nativeOnStartTask(long nativeBackgroundTaskUpdateScheduler);
+     private native void nativeOnStopTask(long nativeBackgroundTaskUpdateScheduler);
+-}
+\ No newline at end of file
+}
+-- 
+2.11.0
+
@@ -9,7 +9,7 @@ Subject: Fix crash when accessing page info / site settings
 diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
 --- a/chrome/browser/permissions/permission_manager.cc
 +++ b/chrome/browser/permissions/permission_manager.cc
-@@ -633,6 +633,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
+@@ -675,6 +675,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
   GURL canonical_requesting_origin =
       GetCanonicalOrigin(requesting_origin, embedding_origin);
   PermissionContextBase* context = GetPermissionContext(permission);
@@ -5,6 +5,7 @@ Subject: Inject scripts for AMP, tracking, ads and video functionality
 Remove AMP, tracking and ads from search results
 Break Page Visibility API and Fullscreen API for youtube.com and vimeo.com to
 allow playing videos in background (original Javascript code by timdream)
+Send a random key press to circumvent idle status detection
 ---
 third_party/blink/renderer/core/dom/BUILD.gn       |  2 ++
 third_party/blink/renderer/core/dom/document.cc    | 28 +++++++++++++++++++++-
@@ -17,7 +18,7 @@ allow playing videos in background (original Javascript code by timdream)
 diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/renderer/core/dom/BUILD.gn
 --- a/third_party/blink/renderer/core/dom/BUILD.gn
 +++ b/third_party/blink/renderer/core/dom/BUILD.gn
-@@ -147,6 +147,8 @@ blink_core_sources("dom") {
+@@ -145,6 +145,8 @@ blink_core_sources("dom") {
     "global_event_handlers.h",
     "icon_url.cc",
     "icon_url.h",
@@ -29,7 +30,7 @@ diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/re
 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -223,6 +223,7 @@
+@@ -230,6 +230,7 @@
 #include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h"
 #include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h"
 #include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h"
@@ -37,7 +38,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 #include "third_party/blink/renderer/core/paint/compositing/paint_layer_compositor.h"
 #include "third_party/blink/renderer/core/paint/first_meaningful_paint_detector.h"
 #include "third_party/blink/renderer/core/paint/paint_layer.h"
-@@ -282,6 +283,8 @@
+@@ -289,6 +290,8 @@
 #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h"
 #include "third_party/blink/renderer/platform/wtf/time.h"
 
@@ -46,7 +47,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 #ifndef NDEBUG
 using WeakDocumentSet =
     blink::PersistentHeapHashSet<blink::WeakMember<blink::Document>>;
-@@ -5926,8 +5929,31 @@ void Document::FinishedParsing() {
+@@ -6027,8 +6030,31 @@ void Document::FinishedParsing() {
     fetcher_->ClearResourcesFromPreviousFetcher();
   }
 
@@ -76,9 +77,9 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 +      bodyElement->AppendChild(e);
 +    }
 +  } // has origin and body element
- 
-   FirstMeaningfulPaintDetector::From(*this).CheckNetworkStable();
 }
+ 
+ void Document::ElementDataCacheClearTimerFired(TimerBase*) {
 diff --git a/third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h b/third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h
 new file mode 100644
 --- /dev/null
@@ -98,7 +99,7 @@ new file mode 100644
 +#ifndef video_bg_play_h
 +#define video_bg_play_h
 +
-+#define VIDEO_BG_PLAY_JS "'use strict';\n\n/* video background play fix - original version by timdream */\ndocument.videoBGFix = {};\n\n// Page Visibility API\nObject.defineProperties(document.videoBGFix,\n  { 'hidden': {value: false}, 'visibilityState': {value: 'visible'} });\n\nwindow.addEventListener(\n  'visibilitychange', evt => evt.stopImmediatePropagation(), true);\nwindow.addEventListener(\n  'blur', evt => evt.stopImmediatePropagation(), true);\n\n// Fullscreen API\nwindow.addEventListener('fullscreenchange', evt => {\n  Object.defineProperties(document.videoBGFix,\n    { 'fullscreenEnabled': {value: true},\n      'fullscreen': {value: true},\n      'fullscreenElement': {value: document.fullscreenElement.videoBGFix}});\n  window.addEventListener(\n    'fullscreenchange', evt => evt.stopImmediatePropagation(), true);\n}, { capture: true, once: true });\n"
+#define VIDEO_BG_PLAY_JS "'use strict';\n\n/* generate a synthetic keypress to circumvent the extremely useful pause-and-prompt beaviour */\nsetInterval(function() {\n  document.dispatchEvent(new KeyboardEvent(\"keydown\", {key : \"a\", char : \"a\", shiftKey: false}));\n}, 3 * 60 * 1000);\n\n/* video background play fix - original version by timdream */\ndocument.videoBGFix = {};\n\n// Page Visibility API\nObject.defineProperties(document.videoBGFix,\n  { 'hidden': {value: false}, 'visibilityState': {value: 'visible'} });\n\nwindow.addEventListener(\n  'visibilitychange', evt => evt.stopImmediatePropagation(), true);\nwindow.addEventListener(\n  'blur', evt => evt.stopImmediatePropagation(), true);\n\n// Fullscreen API\nwindow.addEventListener('fullscreenchange', evt => {\n  Object.defineProperties(document.videoBGFix,\n    { 'fullscreenEnabled': {value: true},\n      'fullscreen': {value: true},\n      'fullscreenElement': {value: document.fullscreenElement.videoBGFix}});\n  window.addEventListener(\n    'fullscreenchange', evt => evt.stopImmediatePropagation(), true);\n}, { capture: true, once: true });\n"
 +
 +#endif  // video_bg_play_h
 -- 
@@ -10,7 +10,7 @@ Subject: Allow playing audio in background
 diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
 --- a/media/blink/webmediaplayer_impl.cc
 +++ b/media/blink/webmediaplayer_impl.cc
-@@ -862,6 +862,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+@@ -879,6 +879,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
   return pipeline_metadata_.has_audio;
 }
 
@@ -23,10 +23,10 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp
 void WebMediaPlayerImpl::EnabledAudioTracksChanged(
     const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -2953,7 +2959,10 @@ bool WebMediaPlayerImpl::ShouldPauseVideoWhenHidden() const {
+@@ -2993,7 +2999,10 @@ bool WebMediaPlayerImpl::ShouldPauseVideoWhenHidden() const {
   // If suspending background video, pause any video that's not remoted or
   // not unlocked to play in the background.
-   if (IsBackgroundedSuspendEnabled()) {
+   if (IsBackgroundSuspendEnabled(delegate_)) {
 -    if (!HasVideo())
 +    //pipeline_metadata_.has_video is true for MediaPlayerRenderer,
 +    //see media/base/pipeline_metadata.h. This is a workaround to allow audio
@@ -38,7 +38,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp
 diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
 --- a/media/blink/webmediaplayer_impl.h
 +++ b/media/blink/webmediaplayer_impl.h
-@@ -159,6 +159,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
+@@ -161,6 +161,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
   // True if the loaded media has a playable video/audio track.
   bool HasVideo() const override;
   bool HasAudio() const override;
@@ -0,0 +1,74 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 25 Oct 2018 23:13:34 +0200
+Subject: Add flag to control video playback resume feature
+
+Disable it by default on Android as it is everywhere else
+---
+ chrome/browser/about_flags.cc       | 5 +++++
+ chrome/browser/flag_descriptions.cc | 5 +++++
+ chrome/browser/flag_descriptions.h  | 3 +++
+ media/base/media_switches.cc        | 6 +-----
+ 4 files changed, 14 insertions(+), 5 deletions(-)
+
+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
+@@ -3520,6 +3520,11 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(media::kPictureInPicture)},
+ #endif  // !defined(OS_ANDROID)
+ 
+    {"resume-background-video",
+     flag_descriptions::kResumeBackgroundVideoName,
+     flag_descriptions::kResumeBackgroundVideoDescription, kOsAll,
+     FEATURE_VALUE_TYPE(media::kResumeBackgroundVideo)},
+
+ #if defined(OS_MACOSX)
+     {"mac-touchbar", flag_descriptions::kMacTouchBarName,
+      flag_descriptions::kMacTouchBarDescription, kOsMac,
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
+@@ -747,6 +747,11 @@ const char kEnablePictureInPictureName[] = "Enable Picture-in-Picture.";
+ const char kEnablePictureInPictureDescription[] =
+     "Enable the Picture-in-Picture feature for videos.";
+ 
+const char kResumeBackgroundVideoName[] = "Resume background video.";
+const char kResumeBackgroundVideoDescription[] =
+    "Resume background video playback when tab re-gains focus; additionally, "
+    "it will pause video playback every single time you switch tabs.";
+
+ const char kEnablePixelCanvasRecordingName[] = "Enable pixel canvas recording";
+ const char kEnablePixelCanvasRecordingDescription[] =
+     "Pixel canvas recording allows the compositor to raster contents aligned "
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
+@@ -465,6 +465,9 @@ extern const char kOOPHPStackModePseudo[];
+ extern const char kEnablePictureInPictureName[];
+ extern const char kEnablePictureInPictureDescription[];
+ 
+extern const char kResumeBackgroundVideoName[];
+extern const char kResumeBackgroundVideoDescription[];
+
+ extern const char kEnablePixelCanvasRecordingName[];
+ extern const char kEnablePixelCanvasRecordingDescription[];
+ 
+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
+@@ -220,11 +220,7 @@ const base::Feature kPreloadMetadataSuspend{"PreloadMetadataSuspend",
+ // when in background.
+ const base::Feature kResumeBackgroundVideo {
+   "resume-background-video",
+-#if defined(OS_ANDROID)
+-      base::FEATURE_ENABLED_BY_DEFAULT
+-#else
+-      base::FEATURE_DISABLED_BY_DEFAULT
+-#endif
+   base::FEATURE_DISABLED_BY_DEFAULT
+ };
+ 
+ // Display the Cast overlay button on the media controls.
+-- 
+2.11.0
+
@@ -25,7 +25,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2022,6 +2022,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2019,6 +2019,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             RecordUserAction.record("MobileMenuSettings");
         } else if (id == R.id.show_menu) {
             showAppMenuForKeyboardEvent();
@@ -53,7 +53,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2837,6 +2837,9 @@ To obtain new licenses, connect to the internet and play your downloaded content
+@@ -2921,6 +2921,9 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_MENU_PREFERENCES" desc="Menu item for opening browser preferences. [CHAR-LIMIT=27]">
         Settings
       </message>
@@ -24,7 +24,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2046,15 +2046,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2043,15 +2043,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
 
         final Tab currentTab = getActivityTab();
 
@@ -43,7 +43,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
-@@ -338,9 +338,6 @@ public class KeyboardShortcuts {
+@@ -341,9 +341,6 @@ public class KeyboardShortcuts {
                     tab = activity.getActivityTab();
                     if (tab != null && tab.canGoForward()) tab.goForward();
                     return true;
@@ -56,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
-@@ -1219,7 +1219,7 @@ public class CustomTabActivity extends ChromeActivity {
+@@ -1220,7 +1220,7 @@ public class CustomTabActivity extends ChromeActivity {
     public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) {
         // Disable creating new tabs, bookmark, history, print, help, focus_url, etc.
         if (id == R.id.focus_url_bar || id == R.id.all_bookmarks_menu_id
@@ -75,7 +75,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2114,6 +2114,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2111,6 +2111,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             final boolean usingDesktopUserAgent = currentTab.getUseDesktopUserAgent();
             currentTab.setUseDesktopUserAgent(!usingDesktopUserAgent, reloadOnChange);
             RecordUserAction.record("MobileMenuRequestDesktopSite");
@@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1707,6 +1707,14 @@ public class ChromeTabbedActivity
+@@ -1711,6 +1711,14 @@ public class ChromeTabbedActivity
                 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
             }
             RecordUserAction.record("MobileMenuDownloadManager");
@@ -111,15 +111,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
-@@ -24,6 +24,7 @@ import org.chromium.base.metrics.RecordHistogram;
- import org.chromium.chrome.R;
+@@ -25,6 +25,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
+ import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.ChromeSwitches;
 +import org.chromium.chrome.browser.ContentSettingsType;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.banners.AppBannerManager;
-@@ -196,6 +197,8 @@ public class AppMenuPropertiesDelegate {
+@@ -197,6 +198,8 @@ public class AppMenuPropertiesDelegate {
 
             updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
 
@@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
             // Only display reader mode settings menu option if the current page is in reader mode.
             menu.findItem(R.id.reader_mode_prefs_id)
                     .setVisible(DomDistillerUrlUtils.isDistilledPage(currentTab.getUrl()));
-@@ -418,6 +421,41 @@ public class AppMenuPropertiesDelegate {
+@@ -436,6 +439,41 @@ public class AppMenuPropertiesDelegate {
     }
 
     /**
@@ -173,7 +173,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-@@ -165,6 +165,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -172,6 +172,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
             }
 
             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
@@ -184,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2822,6 +2822,17 @@ To obtain new licenses, connect to the internet and play your downloaded content
+@@ -2906,6 +2906,17 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_MENU_FIND_IN_PAGE" desc="Menu item allowing users to find text within the current page. [CHAR-LIMIT=27]">
         Find in page
       </message>
@@ -18,12 +18,12 @@ New mechanism for adblocking based on Brave's adblocking hook
 .../browser/appmenu/AppMenuPropertiesDelegate.java |  38 +++
 .../CustomTabAppMenuPropertiesDelegate.java        |   2 +
 .../java/strings/android_chrome_strings.grd        |  11 +
- chrome/browser/net/chrome_network_delegate.cc      |  58 ++++
+ chrome/browser/net/chrome_network_delegate.cc      |  62 ++++
 .../subresource_filter_content_settings_manager.cc |   1 +
 net/BUILD.gn                                       |   7 +
 net/url_request/adblock_intercept.cc               | 325 +++++++++++++++++++++
 net/url_request/adblock_intercept.h                |  24 ++
- 12 files changed, 505 insertions(+)
+ 12 files changed, 509 insertions(+)
 create mode 100644 net/url_request/adblock_intercept.cc
 create mode 100644 net/url_request/adblock_intercept.h

@@ -73,7 +73,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2124,6 +2124,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2121,6 +2121,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             RecordUserAction.record("MobileMenuRequestEnableJavascript");
         } else if (id == R.id.reader_mode_prefs_id) {
             DomDistillerUIUtils.openSettings(currentTab.getWebContents());
@@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1665,6 +1665,14 @@ public class ChromeTabbedActivity
+@@ -1669,6 +1669,14 @@ public class ChromeTabbedActivity
                 reportNewTabShortcutUsed(true);
                 getTabCreator(true).launchNTP();
             }
@@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
-@@ -195,6 +195,8 @@ public class AppMenuPropertiesDelegate {
+@@ -196,6 +196,8 @@ public class AppMenuPropertiesDelegate {
                     && !TextUtils.isEmpty(url);
             prepareAddToHomescreenMenuItem(menu, currentTab, canShowHomeScreenMenuItem);
 
@@ -118,7 +118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
             updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
 
             updateEnableJavascriptMenuItem(menu, currentTab);
-@@ -456,6 +458,42 @@ public class AppMenuPropertiesDelegate {
+@@ -474,6 +476,42 @@ public class AppMenuPropertiesDelegate {
     }
 
     /**
@@ -164,7 +164,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-@@ -164,6 +164,8 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -171,6 +171,8 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
                 }
             }
 
@@ -176,7 +176,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2842,6 +2842,17 @@ To obtain new licenses, connect to the internet and play your downloaded content
+@@ -2926,6 +2926,17 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_MENU_REQUEST_DESKTOP_SITE_OFF" desc="Accessibility description for when Request Desktop Site is disabled.">
         Turn on Request desktop site
       </message>
@@ -205,7 +205,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/net/chrome_extensions_network_delegate.h"
-@@ -59,6 +60,7 @@
+@@ -57,6 +58,7 @@
 #if defined(OS_ANDROID)
 #include "base/android/path_utils.h"
 #include "chrome/browser/io_thread.h"
@@ -213,8 +213,8 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
 #endif
 
 #if defined(OS_CHROMEOS)
-@@ -215,10 +217,64 @@ void ChromeNetworkDelegate::InitializePrefsOnUIThread(
-   }
+@@ -174,15 +176,75 @@ void ChromeNetworkDelegate::set_cookie_settings(
+   cookie_settings_ = cookie_settings;
 }
 
 +#define TRANSPARENT1PXGIF "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
@@ -244,14 +244,18 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
 +      content::WebContents* web_contents = web_contents_getter.Run();
 +      if (web_contents) {
 +        Profile* profile = Profile::FromBrowserContext(web_contents->GetBrowserContext());
+        //FIXME: this should not be called from the IO thread
 +        const HostContentSettingsMap* content_settings = HostContentSettingsMapFactory::GetForProfile(profile);
 +
-+        // check global value first
-+        adblock_enabled = CONTENT_SETTING_BLOCK == content_settings->GetDefaultContentSetting(ContentSettingsType::CONTENT_SETTINGS_TYPE_ADS, NULL);
+        if (content_settings) {
+          // check global value first
+          adblock_enabled = CONTENT_SETTING_BLOCK == content_settings->GetDefaultContentSetting(ContentSettingsType::CONTENT_SETTINGS_TYPE_ADS, NULL);
 +
-+        if (!adblock_enabled) {
-+          adblock_enabled = CONTENT_SETTING_BLOCK == content_settings->GetContentSetting(request->url(), GURL(), ContentSettingsType::CONTENT_SETTINGS_TYPE_ADS,
-+                                                             std::string());
+          if (!adblock_enabled) {
+            // check per-site value
+            adblock_enabled = CONTENT_SETTING_BLOCK == content_settings->GetContentSetting(request->url(), GURL(), ContentSettingsType::CONTENT_SETTINGS_TYPE_ADS,
+                                                               std::string());
+          }
 +        }
 +      }
 +
@@ -276,10 +280,8 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
 +#endif // OS_ANDROID
 +
   extensions_delegate_->ForwardStartRequestStatus(request);
- 
-   bool force_safe_search =
-@@ -248,6 +304,8 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
-   return rv;
+   return extensions_delegate_->NotifyBeforeURLRequest(
+       request, std::move(callback), new_url);
 }
 
 +#undef TRANSPARENT1PXGIF
@@ -301,7 +303,7 @@ diff --git a/chrome/browser/subresource_filter/subresource_filter_content_settin
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1715,6 +1715,13 @@ component("net") {
+@@ -1712,6 +1712,13 @@ component("net") {
       "url_request/websocket_handshake_userdata_key.h",
     ]
 
@@ -4,9 +4,9 @@ Subject: User Agent: anonymize

 Use a fixed device name and Chrome product version.
 ---
- components/version_info/version_info.cc | 17 ++++++++++++-
- content/common/user_agent.cc            | 45 +++++++++++++++++++--------------
- 2 files changed, 42 insertions(+), 20 deletions(-)
+ components/version_info/version_info.cc | 17 ++++++++++-
+ content/common/user_agent.cc            | 50 ++++++++++++++++-----------------
+ 2 files changed, 40 insertions(+), 27 deletions(-)

 diff --git a/components/version_info/version_info.cc b/components/version_info/version_info.cc
 --- a/components/version_info/version_info.cc
@@ -44,19 +44,27 @@ diff --git a/components/version_info/version_info.cc b/components/version_info/v
 diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
 --- a/content/common/user_agent.cc
 +++ b/content/common/user_agent.cc
-@@ -59,26 +59,33 @@ std::string BuildOSCpuInfo() {
+@@ -22,11 +22,6 @@
+ 
+ namespace content {
+ 
+-#if defined(OS_ANDROID)
+-const base::Feature kAndroidUserAgentStringContainsBuildId{
+-    "AndroidUserAgentStringContainsBuildId", base::FEATURE_DISABLED_BY_DEFAULT};
+-#endif  // defined(OS_ANDROID)
+-
+ std::string GetWebKitVersion() {
+   return base::StringPrintf("%d.%d (%s)",
+                             WEBKIT_VERSION_MAJOR,
+@@ -65,29 +60,32 @@ std::string BuildOSCpuInfo(bool include_android_build_number) {
       architecture_token = "; Win64; IA64";
   }
 #elif defined(OS_ANDROID)
 -  std::string android_version_str = base::SysInfo::OperatingSystemVersion();
-+  int32_t major, minor, bugfix;
-+  base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
-+  std::string android_version_str = base::StringPrintf("%d.%d.%d", major, minor, bugfix);
+  std::string android_version_str = base::StringPrintf("%d.%d.%d", os_major_version, os_minor_version, os_bugfix_version);
 
-+  // Send information about the device and buld ID.
-+  // Use a common device/build ID based on Android major version.
   std::string android_info_str;
-
+ 
 -  // Send information about the device.
 -  bool semicolon_inserted = false;
 -  std::string android_build_codename = base::SysInfo::GetAndroidBuildCodename();
@@ -67,13 +75,18 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
 -  }
 -
 -  // Append the build ID.
-  std::string android_build_id = base::SysInfo::GetAndroidBuildID();
-  if (android_build_id.size() > 0) {
-    if (!semicolon_inserted) {
-      android_info_str += ";";
+-  if (base::FeatureList::IsEnabled(kAndroidUserAgentStringContainsBuildId) ||
+-      include_android_build_number) {
+-    std::string android_build_id = base::SysInfo::GetAndroidBuildID();
+-    if (android_build_id.size() > 0) {
+-      if (!semicolon_inserted) {
+-        android_info_str += ";";
+-      }
+-      android_info_str += " Build/" + android_build_id;
 -    }
-    android_info_str += " Build/" + android_build_id;
-+  switch (major) {
+  // Send information about the device and build ID.
+  // Use a common device/build ID based on Android major version.
+  switch (os_major_version) {
 +    case 7:
 +      // Chrome/63.0.3239.111
 +      android_info_str = "SM-J730GM Build/NRD90M";
@@ -94,9 +107,9 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
 +      android_info_str = "SM-G950U Build/R16NW";
 +      break;
   }
+ 
 #elif (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_FUCHSIA)
-   // Should work on any Posix system.
-@@ -115,7 +122,7 @@ std::string BuildOSCpuInfo() {
+@@ -125,7 +123,7 @@ std::string BuildOSCpuInfo(bool include_android_build_number) {
       os_minor_version,
       os_bugfix_version
 #elif defined(OS_ANDROID)
@@ -43,7 +43,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/thir
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
-@@ -314,6 +314,7 @@ void AudioContext::StopRendering() {
+@@ -315,6 +315,7 @@ void AudioContext::StopRendering() {
 double AudioContext::baseLatency() const {
   DCHECK(IsMainThread());
   DCHECK(destination());
@@ -4,17 +4,18 @@ Subject: Canvas: fingerprinting mitigations for image data and webGL

 Disable webGL renderer info and modify the color data returned by ToBlob,
 ToDataURL and getImageData so that it will contain randomly manipulated
-pixels (maximum 10) that slightly change the color of the R,G,B components
+pixels (maximum 20) that slightly change the color of the R,G,B components
 without a visible effect.

 Credits to Slaviro (https://github.com/Slaviro) for coming up with a better
 approach to change color components.
 ---
 .../modules/webgl/webgl_debug_renderer_info.cc     |   4 +-
+ third_party/blink/renderer/platform/BUILD.gn       |   4 +-
 .../platform/graphics/image_data_buffer.cc         |   5 +
- .../platform/graphics/static_bitmap_image.cc       | 154 +++++++++++++++++++++
+ .../platform/graphics/static_bitmap_image.cc       | 156 +++++++++++++++++++++
 .../platform/graphics/static_bitmap_image.h        |   2 +
- 4 files changed, 163 insertions(+), 2 deletions(-)
+ 5 files changed, 168 insertions(+), 3 deletions(-)

 diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
 --- a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
@@ -33,6 +34,20 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.
 }
 
 const char* WebGLDebugRendererInfo::ExtensionName() {
+diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
+--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
+@@ -1428,7 +1428,9 @@ jumbo_component("platform") {
+     "//third_party/blink/renderer:non_test_config",
+   ]
+ 
+-  include_dirs = []
+  include_dirs = [
+    "//third_party/skia/include/private", # For shuffler in graphics/static_bitmap_image.cc
+  ]
+ 
+   public_deps = [
+     ":blink_platform_public_deps",
 diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
 --- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
 +++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
@@ -44,15 +59,15 @@ diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b
 +#include "base/logging.h"
 #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
 #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
- #include "third_party/blink/renderer/platform/network/mime/mime_type_registry.h"
-@@ -129,6 +131,9 @@ bool ImageDataBuffer::EncodeImageInternal(const String& mime_type,
+ #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
+@@ -128,6 +130,9 @@ bool ImageDataBuffer::EncodeImageInternal(const ImageEncodingMimeType mime_type,
                                           const SkPixmap& pixmap) const {
   DCHECK(is_valid_);
 
 +  // shuffle subchannel color data within the pixmap
 +  StaticBitmapImage::ShuffleSubchannelColorData(pixmap_.writable_addr(), pixmap_.info(), 0, 0);
 +
-   if (mime_type == "image/jpeg") {
+   if (mime_type == kMimeTypeJpeg) {
     SkJpegEncoder::Options options;
     options.fQuality = ImageEncoder::ComputeJpegQuality(quality);
 diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc b/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
@@ -75,7 +90,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 #include "third_party/skia/include/gpu/GrContext.h"
 
 namespace blink {
-@@ -154,10 +157,161 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
+@@ -154,10 +157,163 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
   DCHECK(read_pixels_successful ||
          !sk_image->bounds().intersect(SkIRect::MakeXYWH(
              rect.X(), rect.Y(), info.width(), info.height())));
@@ -104,8 +119,8 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 +
 +  // cap maximum pixels to change
 +  auto pixels = (w + h) / 128;
-+  if (pixels > 10) {
-+    pixels = 10;
+  if (pixels > 20) {
+    pixels = 20;
 +  } else if (pixels < 2) {
 +    pixels = 2;
 +  }
@@ -124,7 +139,9 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 +    int x = currentW * shuffleX, y = currentH * shuffleY;
 +
 +    // calculate randomisation amounts for each RGB component
-+    auto shuffleR = (uint8_t)base::RandInt(0, 4), shuffleG = (uint8_t)base::RandInt(0, 4), shuffleB = (uint8_t)base::RandInt(0, 4);
+    uint8_t shuffleR = base::RandInt(0, 4);
+    uint8_t shuffleG = (shuffleR + x) % 4;
+    uint8_t shuffleB = (shuffleG + y) % 4;
 +
 +    // manipulate pixel data to slightly change the R, G, B components
 +    switch (colorType) {
@@ -31,7 +31,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
 
 #include "third_party/blink/public/platform/web_scroll_into_view_params.h"
 #include "third_party/blink/renderer/bindings/core/v8/dictionary.h"
-@@ -1382,6 +1383,15 @@ DOMRectList* Element::getClientRects() {
+@@ -1383,6 +1384,15 @@ DOMRectList* Element::getClientRects() {
   DCHECK(element_layout_object);
   GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
       quads, *element_layout_object);
@@ -47,7 +47,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
   return DOMRectList::Create(quads);
 }
 
-@@ -1399,6 +1409,13 @@ DOMRect* Element::getBoundingClientRect() {
+@@ -1400,6 +1410,13 @@ DOMRect* Element::getBoundingClientRect() {
   DCHECK(element_layout_object);
   GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
                                                         *element_layout_object);
@@ -73,7 +73,7 @@ diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/re
 #include "third_party/blink/renderer/bindings/core/v8/string_or_trusted_html.h"
 #include "third_party/blink/renderer/core/dom/character_data.h"
 #include "third_party/blink/renderer/core/dom/container_node.h"
-@@ -1604,11 +1606,27 @@ DOMRectList* Range::getClientRects() const {
+@@ -1607,11 +1609,27 @@ DOMRectList* Range::getClientRects() const {
   Vector<FloatQuad> quads;
   GetBorderAndTextQuads(quads);
 
@@ -105,7 +105,7 @@ diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/re
 diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
 --- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
 +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
-@@ -48,6 +48,24 @@ float TextMetrics::GetFontBaseline(const TextBaseline& text_baseline,
+@@ -49,6 +49,24 @@ float TextMetrics::GetFontBaseline(const TextBaseline& text_baseline,
   return 0;
 }
 
@@ -122,9 +122,9 @@ diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third
 +  actual_bounding_box_descent_ *= factor;
 +  em_height_ascent_ *= factor;
 +  em_height_descent_ *= factor;
-+  hanging_baseline_ *= factor;
-+  alphabetic_baseline_ *= factor;
-+  ideographic_baseline_ *= factor;
+  baselines_.setAlphabetic(baselines_.alphabetic() * factor);
+  baselines_.setHanging(baselines_.hanging() * factor);
+  baselines_.setIdeographic(baselines_.ideographic() * factor);
 +}
 +
 void TextMetrics::Update(const Font& font,
@@ -154,7 +154,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/task_type.h"
 #include "third_party/blink/public/platform/web_scroll_into_view_params.h"
-@@ -775,8 +777,14 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
+@@ -781,8 +783,14 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
   else
     direction = ToTextDirection(GetState().GetDirection(), canvas());
 
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 22 Oct 2018 21:14:57 +0200
+Subject: Disable generic sensor API by default
+
+---
+ services/device/public/cpp/device_features.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/services/device/public/cpp/device_features.cc b/services/device/public/cpp/device_features.cc
+--- a/services/device/public/cpp/device_features.cc
+++ b/services/device/public/cpp/device_features.cc
+@@ -9,7 +9,7 @@ namespace features {
+ // Enables sensors based on Generic Sensor API:
+ // https://w3c.github.io/sensors/
+ const base::Feature kGenericSensor{"GenericSensor",
+-                                   base::FEATURE_ENABLED_BY_DEFAULT};
+                                   base::FEATURE_DISABLED_BY_DEFAULT};
+ // Enables an extra set of concrete sensors classes based on Generic Sensor API,
+ // which expose previously unexposed platform features, e.g. ALS or Magnetometer
+ const base::Feature kGenericSensorExtraClasses{
+-- 
+2.11.0
+
@@ -0,0 +1,184 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 22 Oct 2018 21:29:53 +0200
+Subject: Add flags to disable device motion and orientation APIs
+
+Both flags will be disabled by default and prevent usage of gyroscope and
+legacy acceleration events.
+---
+ chrome/browser/about_flags.cc                                  |  6 ++++++
+ chrome/browser/flag_descriptions.cc                            |  8 ++++++++
+ chrome/browser/flag_descriptions.h                             |  6 ++++++
+ content/child/runtime_features.cc                              |  3 +++
+ content/public/common/content_features.cc                      | 10 ++++++++++
+ content/public/common/content_features.h                       |  2 ++
+ third_party/blink/public/platform/web_runtime_features.h       |  2 ++
+ third_party/blink/renderer/modules/modules_initializer.cc      |  9 ++++++---
+ .../blink/renderer/platform/exported/web_runtime_features.cc   |  8 ++++++++
+ .../blink/renderer/platform/runtime_enabled_features.json5     |  8 ++++++++
+ 10 files changed, 59 insertions(+), 3 deletions(-)
+
+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
+@@ -3041,6 +3041,12 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-generic-sensor", flag_descriptions::kEnableGenericSensorName,
+      flag_descriptions::kEnableGenericSensorDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kGenericSensor)},
+    {"enable-device-motion", flag_descriptions::kEnableDeviceMotionName,
+     flag_descriptions::kEnableDeviceMotionDescription, kOsAll,
+     FEATURE_VALUE_TYPE(features::kDeviceMotion)},
+    {"enable-device-orientation", flag_descriptions::kEnableDeviceOrientationName,
+     flag_descriptions::kEnableDeviceOrientationDescription, kOsAll,
+     FEATURE_VALUE_TYPE(features::kDeviceOrientation)},
+     {"enable-generic-sensor-extra-classes",
+      flag_descriptions::kEnableGenericSensorExtraClassesName,
+      flag_descriptions::kEnableGenericSensorExtraClassesDescription, kOsAll,
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
+@@ -556,6 +556,14 @@ const char kEnableGenericSensorDescription[] =
+     "Accelerometer, LinearAccelerationSensor, Gyroscope, "
+     "AbsoluteOrientationSensor and RelativeOrientationSensor interfaces.";
+ 
+const char kEnableDeviceMotionName[] = "Enable device motion";
+const char kEnableDeviceMotionDescription[] =
+    "Enable device motion API which is used to detect changes in acceleration";
+
+const char kEnableDeviceOrientationName[] = "Enable device orientation";
+const char kEnableDeviceOrientationDescription[] =
+    "Enable device orientation API which is used to detect changes in orientation";
+
+ const char kEnableGenericSensorExtraClassesName[] =
+     "Generic Sensor Extra Classes";
+ const char kEnableGenericSensorExtraClassesDescription[] =
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
+@@ -366,6 +366,12 @@ extern const char kEnableEnumeratingAudioDevicesDescription[];
+ extern const char kEnableGenericSensorName[];
+ extern const char kEnableGenericSensorDescription[];
+ 
+extern const char kEnableDeviceMotionName[];
+extern const char kEnableDeviceMotionDescription[];
+
+extern const char kEnableDeviceOrientationName[];
+extern const char kEnableDeviceOrientationDescription[];
+
+ extern const char kEnableGenericSensorExtraClassesName[];
+ extern const char kEnableGenericSensorExtraClassesDescription[];
+ 
+diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
+--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
+@@ -144,6 +144,9 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
+   if (command_line.HasSwitch(switches::kDisableSharedWorkers))
+     WebRuntimeFeatures::EnableSharedWorker(false);
+ 
+  WebRuntimeFeatures::EnableDeviceMotion(base::FeatureList::IsEnabled(features::kDeviceMotion));
+  WebRuntimeFeatures::EnableDeviceOrientation(base::FeatureList::IsEnabled(features::kDeviceOrientation));
+
+   if (command_line.HasSwitch(switches::kDisableSpeechAPI))
+     WebRuntimeFeatures::EnableScriptedSpeech(false);
+ 
+diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
+--- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc
+@@ -590,6 +590,16 @@ const base::Feature kWebRtcUseGpuMemoryBufferVideoFrames{
+ // https://wicg.github.io/webusb
+ const base::Feature kWebUsb{"WebUSB", base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+// Enables the device motion API used to track device acceleration;
+// no user authorization or notifications happens when in use.
+const base::Feature kDeviceMotion{"DeviceMotion",
+                                    base::FEATURE_DISABLED_BY_DEFAULT};
+
+// Enables the device orientation API used to track device orientation;
+// no user authorization or notifications happens when in use.
+const base::Feature kDeviceOrientation{"DeviceOrientation",
+                                    base::FEATURE_DISABLED_BY_DEFAULT};
+
+ // Controls whether WebVR VSync-aligned render loop timing is enabled.
+ const base::Feature kWebVrVsyncAlign{"WebVrVsyncAlign",
+                                      base::FEATURE_ENABLED_BY_DEFAULT};
+diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
+--- a/content/public/common/content_features.h
+++ b/content/public/common/content_features.h
+@@ -155,6 +155,8 @@ CONTENT_EXPORT extern const char kWebXrRenderPathParamValueGpuFence[];
+ CONTENT_EXPORT extern const char kWebXrRenderPathParamValueSharedBuffer[];
+ #endif  // defined(OS_ANDROID)
+ 
+CONTENT_EXPORT extern const base::Feature kDeviceMotion, kDeviceOrientation;
+
+ #if !defined(OS_ANDROID)
+ CONTENT_EXPORT extern const base::Feature kWebUIPolymer2;
+ #endif  // !defined(OS_ANDROID)
+diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
+--- a/third_party/blink/public/platform/web_runtime_features.h
+++ b/third_party/blink/public/platform/web_runtime_features.h
+@@ -84,6 +84,8 @@ class WebRuntimeFeatures {
+   BLINK_PLATFORM_EXPORT static void EnableCSSFragmentIdentifiers(bool);
+   BLINK_PLATFORM_EXPORT static void EnableScrollTopLeftInterop(bool);
+   BLINK_PLATFORM_EXPORT static void EnableDatabase(bool);
+  BLINK_PLATFORM_EXPORT static void EnableDeviceMotion(bool);
+  BLINK_PLATFORM_EXPORT static void EnableDeviceOrientation(bool);
+   BLINK_PLATFORM_EXPORT static void EnableDecodeToYUV(bool);
+   BLINK_PLATFORM_EXPORT static void EnableDisplayCutoutAPI(bool);
+   BLINK_PLATFORM_EXPORT static void EnableFastMobileScrolling(bool);
+diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_party/blink/renderer/modules/modules_initializer.cc
+--- a/third_party/blink/renderer/modules/modules_initializer.cc
+++ b/third_party/blink/renderer/modules/modules_initializer.cc
+@@ -233,9 +233,12 @@ void ModulesInitializer::InitInspectorAgentSession(
+ void ModulesInitializer::OnClearWindowObjectInMainWorld(
+     Document& document,
+     const Settings& settings) const {
+-  DeviceMotionController::From(document);
+-  DeviceOrientationController::From(document);
+-  DeviceOrientationAbsoluteController::From(document);
+  if (RuntimeEnabledFeatures::DeviceMotionEnabled())
+    DeviceMotionController::From(document);
+  if (RuntimeEnabledFeatures::DeviceOrientationEnabled()) {
+    DeviceOrientationController::From(document);
+    DeviceOrientationAbsoluteController::From(document);
+  }
+   NavigatorGamepad::From(document);
+   NavigatorServiceWorker::From(document);
+   DOMWindowStorageController::From(document);
+diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+@@ -140,6 +140,14 @@ void WebRuntimeFeatures::EnableDatabase(bool enable) {
+   RuntimeEnabledFeatures::SetDatabaseEnabled(enable);
+ }
+ 
+void WebRuntimeFeatures::EnableDeviceMotion(bool enable) {
+  RuntimeEnabledFeatures::SetDeviceMotionEnabled(enable);
+}
+
+void WebRuntimeFeatures::EnableDeviceOrientation(bool enable) {
+  RuntimeEnabledFeatures::SetDeviceOrientationEnabled(enable);
+}
+
+ void WebRuntimeFeatures::EnableDecodeToYUV(bool enable) {
+   RuntimeEnabledFeatures::SetDecodeToYUVEnabled(enable);
+ }
+diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
+--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
+@@ -348,6 +348,14 @@
+       status: "stable",
+     },
+     {
+      name: "DeviceMotion",
+      status: "stable",
+    },
+    {
+      name: "DeviceOrientation",
+      status: "stable",
+    },
+    {
+       name: "DecodeToYUV",
+       status: "experimental",
+     },
+-- 
+2.11.0
+
@@ -10,7 +10,7 @@ Originally from http://bazaar.launchpad.net/~saiarcot895/chromium-browser/chromi
 diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
 --- a/chrome/common/chrome_content_client.cc
 +++ b/chrome/common/chrome_content_client.cc
-@@ -532,7 +532,7 @@ void ChromeContentClient::AddContentDecryptionModules(
+@@ -531,7 +531,7 @@ void ChromeContentClient::AddContentDecryptionModules(
     base::FilePath cdm_path;
     content::CdmCapability capability;
     if (IsWidevineAvailable(&cdm_path, &capability)) {
@@ -9,7 +9,7 @@ Subject: Disable metrics on all I/O threads
 diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
 --- a/chrome/browser/profiles/profile_io_data.cc
 +++ b/chrome/browser/profiles/profile_io_data.cc
-@@ -922,7 +922,7 @@ void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() {
+@@ -956,7 +956,7 @@ void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() {
 
 bool ProfileIOData::GetMetricsEnabledStateOnIOThread() const {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -0,0 +1,287 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 28 Apr 2018 08:30:26 +0200
+Subject: Add a flag for DNS-over-HTTPS
+
+Allow selection between Google and Cloudflare endpoints.
+Serve DoH requests with maximum priority, remove traffic annotation.
+Reduce HTTP headers in DoH requests to bare minimum.
+
+See also: https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-12.txt
+---
+ chrome/browser/about_flags.cc                      | 13 ++++++++++
+ chrome/browser/flag_descriptions.cc                |  3 +++
+ chrome/browser/flag_descriptions.h                 |  3 +++
+ .../browser/net/system_network_context_manager.cc  | 16 ++++++-------
+ .../common/network_features.cc                     |  6 +++--
+ .../common/network_features.h                      |  4 +++-
+ .../common/network_switch_list.h                   |  4 ++++
+ net/base/load_flags_list.h                         |  6 +++++
+ net/dns/dns_transaction.cc                         | 28 +++-------------------
+ net/url_request/url_request_http_job.cc            | 26 ++++++++++++--------
+ 10 files changed, 62 insertions(+), 47 deletions(-)
+
+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
+@@ -417,6 +417,13 @@ const FeatureEntry::Choice kChromeHomeSwipeLogicChoices[] = {
+      switches::kChromeHomeSwipeLogicType, "velocity"},
+ };
+ 
+const FeatureEntry::Choice kDnsOverHttpsChoices[] = {
+    {features::kDnsOverHttpsChoiceDefault, "", ""},
+    {features::kDnsOverHttpsChoiceGoogle, switches::kDnsOverHttpsServer, "https://dns.google.com/experimental"},
+    {features::kDnsOverHttpsChoiceCloudflare, switches::kDnsOverHttpsServer, "https://1.1.1.1/dns-query"},
+    {features::kDnsOverHttpsChoiceQuad9, switches::kDnsOverHttpsServer, "https://9.9.9.9/dns-query"}
+};
+
+ #endif  // OS_ANDROID
+ 
+ const FeatureEntry::Choice kNumRasterThreadsChoices[] = {
+@@ -3730,6 +3737,12 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(features::kAsyncDns)},
+ #endif  // defined(OS_ANDROID)
+ 
+#if defined(OS_ANDROID)
+    {"enable-dns-over-https", flag_descriptions::kDnsOverHttpsName,
+     flag_descriptions::kDnsOverHttpsDescription, kOsAndroid,
+     MULTI_VALUE_TYPE(kDnsOverHttpsChoices)},
+#endif  // defined(OS_ANDROID)
+
+     {"enable-overflow-icons-for-media-controls",
+      flag_descriptions::kOverflowIconsForMediaControlsName,
+      flag_descriptions::kOverflowIconsForMediaControlsDescription, kOsAll,
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
+@@ -2252,6 +2252,9 @@ const char kAndroidPaymentAppsDescription[] =
+ const char kAsyncDnsName[] = "Async DNS resolver";
+ const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
+ 
+const char kDnsOverHttpsName[] = "DNS over HTTPS";
+const char kDnsOverHttpsDescription[] = "Enables DNS-over-HTTPS (experimental).";
+
+ const char kAutofillAccessoryViewName[] =
+     "Autofill suggestions as keyboard accessory view";
+ const char kAutofillAccessoryViewDescription[] =
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
+@@ -1356,6 +1356,9 @@ extern const char kAppNotificationStatusMessagingDescription[];
+ extern const char kAsyncDnsName[];
+ extern const char kAsyncDnsDescription[];
+ 
+extern const char kDnsOverHttpsName[];
+extern const char kDnsOverHttpsDescription[];
+
+ extern const char kAutofillAccessoryViewName[];
+ extern const char kAutofillAccessoryViewDescription[];
+ 
+diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
+--- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc
+@@ -23,6 +23,7 @@
+ #include "chrome/browser/component_updater/crl_set_component_installer.h"
+ #include "chrome/browser/io_thread.h"
+ #include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h"
+#include "components/network_session_configurator/common/network_switches.h"
+ #include "chrome/browser/safe_browsing/safe_browsing_service.h"
+ #include "chrome/browser/ssl/ssl_config_service_manager.h"
+ #include "chrome/common/channel_info.h"
+@@ -355,15 +356,12 @@ SystemNetworkContextManager::SystemNetworkContextManager()
+                                    base::Value(ShouldEnableAsyncDns()));
+   base::ListValue default_doh_servers;
+   base::ListValue default_doh_server_methods;
+-  if (base::FeatureList::IsEnabled(features::kDnsOverHttps)) {
+-    std::string server(variations::GetVariationParamValueByFeature(
+-        features::kDnsOverHttps, "server"));
+-    std::string method(variations::GetVariationParamValueByFeature(
+-        features::kDnsOverHttps, "method"));
+-    if (!server.empty()) {
+-      default_doh_servers.AppendString(server);
+-      default_doh_server_methods.AppendString(method);
+-    }
+  std::string server =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+      switches::kDnsOverHttpsServer);
+  if (!server.empty()) {
+    default_doh_servers.AppendString(server);
+    default_doh_server_methods.AppendString("POST");
+   }
+   local_state->SetDefaultPrefValue(prefs::kDnsOverHttpsServers,
+                                    std::move(default_doh_servers));
+diff --git a/components/network_session_configurator/common/network_features.cc b/components/network_session_configurator/common/network_features.cc
+--- a/components/network_session_configurator/common/network_features.cc
+++ b/components/network_session_configurator/common/network_features.cc
+@@ -11,7 +11,9 @@ namespace features {
+ // TODO(nharper): Disable kChannelID on all platforms in M69.
+ const base::Feature kChannelID{"channel-id", base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+-const base::Feature kDnsOverHttps{"dns-over-https",
+-                                  base::FEATURE_DISABLED_BY_DEFAULT};
+const char kDnsOverHttpsChoiceDefault[] = "Disabled",
+                 kDnsOverHttpsChoiceGoogle[] = "Google",
+                 kDnsOverHttpsChoiceCloudflare[] = "Cloudflare",
+                 kDnsOverHttpsChoiceQuad9[] = "Quad9";
+ 
+ }  // namespace features
+diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h
+--- a/components/network_session_configurator/common/network_features.h
+++ b/components/network_session_configurator/common/network_features.h
+@@ -13,9 +13,11 @@ namespace features {
+ // Enables Channel ID.
+ NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kChannelID;
+ 
+-// Enabled DNS over HTTPS
+// DNS over HTTPS server endpoint choices
+ // (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-12.txt).
+ NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kDnsOverHttps;
+NETWORK_SESSION_CONFIGURATOR_EXPORT extern const char kDnsOverHttpsChoiceDefault[],
+   kDnsOverHttpsChoiceGoogle[], kDnsOverHttpsChoiceCloudflare[], kDnsOverHttpsChoiceQuad9[];
+ 
+ }  // namespace features
+ 
+diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h
+--- a/components/network_session_configurator/common/network_switch_list.h
+++ b/components/network_session_configurator/common/network_switch_list.h
+@@ -35,6 +35,10 @@ NETWORK_SWITCH(kOriginToForceQuicOn, "origin-to-force-quic-on")
+ // the server.
+ NETWORK_SWITCH(kQuicConnectionOptions, "quic-connection-options")
+ 
+// Specifies an IETF DNS-over-HTTPS server endpoint
+// (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-02.txt).
+NETWORK_SWITCH(kDnsOverHttpsServer, "dns-over-https-server")
+
+ // Specifies the maximum length for a QUIC packet.
+ NETWORK_SWITCH(kQuicMaxPacketLength, "quic-max-packet-length")
+ 
+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
+@@ -92,6 +92,12 @@ LOAD_FLAG(MAYBE_USER_GESTURE, 1 << 14)
+ LOAD_FLAG(DO_NOT_USE_EMBEDDED_IDENTITY, 1 << 15)
+ 
+ // Indicates that this request is not to be migrated to a cellular network when
+
+// 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)
+ // QUIC connection migration is enabled.
+ LOAD_FLAG(DISABLE_CONNECTION_MIGRATION_TO_CELLULAR, 1 << 16)
+ 
+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
+@@ -357,30 +357,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
+ 
+     HttpRequestHeaders extra_request_headers;
+     extra_request_headers.SetHeader("Accept", kDnsOverHttpResponseContentType);
+-
+-    request_ = url_request_context->CreateRequest(
+-        url, request_priority_, this,
+-        net::DefineNetworkTrafficAnnotation("dns_over_https", R"(
+-        semantics {
+-          sender: "DNS over HTTPS"
+-          description: "Domain name resolution over HTTPS"
+-          trigger: "User enters a navigates to a domain or Chrome otherwise "
+-                   "makes a connection to a domain whose IP address isn't cached"
+-          data: "The domain name that is being requested"
+-          destination: OTHER
+-          destination_other: "The user configured DNS over HTTPS server, which"
+-                             "may be dns.google.com"
+-        }
+-        policy {
+-          cookies_allowed: NO
+-          setting:
+-            "You can configure this feature via that 'dns_over_https_servers' and"
+-            "'dns_over_https.method' prefs. Empty lists imply this feature is"
+-            "disabled"
+-          policy_exception_justification: "Experimental feature that"
+-                                          "is disabled by default"
+-        }
+-      )"));
+    request_ = url_request_context->CreateRequest(url, request_priority_, this);
+     net_log_ = request_->net_log();
+ 
+     if (use_post) {
+@@ -396,6 +373,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
+ 
+     request_->SetExtraRequestHeaders(extra_request_headers);
+     request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE |
+                           LOAD_IGNORE_LIMITS | LOAD_MINIMAL_HEADERS |
+                            LOAD_BYPASS_PROXY);
+     request_->set_allow_credentials(false);
+   }
+@@ -818,7 +796,7 @@ class DnsTransactionImpl : public DnsTransaction,
+         had_tcp_attempt_(false),
+         doh_attempt_(false),
+         first_server_index_(0),
+-        request_priority_(DEFAULT_PRIORITY) {
+        request_priority_(MAXIMUM_PRIORITY) {
+     DCHECK(session_.get());
+     DCHECK(!hostname_.empty());
+     DCHECK(!callback_.is_null());
+diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
+--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
+@@ -434,21 +434,25 @@ void URLRequestHttpJob::Start() {
+   // plugin could set a referrer although sending the referrer is inhibited.
+   request_info_.extra_headers.RemoveHeader(HttpRequestHeaders::kReferer);
+ 
+-  // Our consumer should have made sure that this is a safe referrer. See for
+-  // instance WebCore::FrameLoader::HideReferrer.
+-  if (referrer.is_valid()) {
+-    request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
+  if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
+    // Our consumer should have made sure that this is a safe referrer. See for
+    // instance WebCore::FrameLoader::HideReferrer.
+    if (referrer.is_valid()) {
+      request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
+                                           referrer.spec());
+    }
+   }
+ 
+   request_info_.token_binding_referrer = request_->token_binding_referrer();
+ 
+   // This should be kept in sync with the corresponding code in
+   // URLRequest::GetUserAgent.
+-  request_info_.extra_headers.SetHeaderIfMissing(
+  if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
+    request_info_.extra_headers.SetHeaderIfMissing(
+       HttpRequestHeaders::kUserAgent,
+       http_user_agent_settings_ ?
+           http_user_agent_settings_->GetUserAgent() : std::string());
+  }
+ 
+   AddExtraHeaders();
+   AddCookieHeaderAndStart();
+@@ -666,10 +670,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
+           HttpRequestHeaders::kAcceptEncoding)) {
+     // Advertise "br" encoding only if transferred data is opaque to proxy.
+     bool advertise_brotli = false;
+-    if (request()->context()->enable_brotli()) {
+-      if (request()->url().SchemeIsCryptographic() ||
+-          IsLocalhost(request()->url())) {
+-        advertise_brotli = true;
+    if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
+      if (request()->context()->enable_brotli()) {
+        if (request()->url().SchemeIsCryptographic() ||
+            IsLocalhost(request()->url())) {
+          advertise_brotli = true;
+        }
+       }
+     }
+ 
+@@ -686,7 +692,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
+                                           advertised_encodings);
+   }
+ 
+-  if (http_user_agent_settings_) {
+  if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS) && http_user_agent_settings_) {
+     // Only add default Accept-Language if the request didn't have it
+     // specified.
+     std::string accept_language =
+-- 
+2.11.0
+
@@ -11,7 +11,7 @@ Do not read experiment value for cronet async DNS configuration
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -179,7 +179,7 @@ void OnAuthPrefsChanged(const std::string& pref_name) {
+@@ -202,7 +202,7 @@ void OnAuthPrefsChanged(const std::string& pref_name) {
 // Android this includes checking the Android version in the field trial.
 bool ShouldEnableAsyncDns() {
   bool feature_can_be_enabled = true;
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
 diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc
 --- a/components/cronet/url_request_context_config.cc
 +++ b/components/cronet/url_request_context_config.cc
-@@ -390,7 +390,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
+@@ -466,7 +466,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
         effective_experimental_options->Remove(it.key(), nullptr);
         continue;
       }
@@ -18,7 +18,7 @@ with limited CPU/memory resources and it is disabled by default.
 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
-@@ -833,6 +833,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
+@@ -910,6 +910,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
      net::kEffectiveConnectionType4G},
 };
 
@@ -30,7 +30,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 ==
-@@ -2426,6 +2431,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2608,6 +2613,9 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kMaterialDesignIncognitoNTPName,
      flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(features::kMaterialDesignIncognitoNTP)},
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1065,6 +1065,10 @@ const char kMaterialDesignIncognitoNTPDescription[] =
+@@ -1145,6 +1145,10 @@ const char kMaterialDesignIncognitoNTPDescription[] =
     "If enabled, the Incognito New Tab page uses the new material design with "
     "a better readable text.";
 
@@ -57,7 +57,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -667,6 +667,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
+@@ -711,6 +711,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
 extern const char kMaterialDesignIncognitoNTPName[];
 extern const char kMaterialDesignIncognitoNTPDescription[];
 
@@ -77,8 +77,8 @@ diff --git a/components/network_session_configurator/common/network_features.cc
 +const char kMaxConnectionsPerHostChoiceDefault[] = "6",
 +                 kMaxConnectionsPerHostChoice15[] = "15";
 +
- const base::Feature kTokenBinding{"token-binding",
-                                   base::FEATURE_DISABLED_BY_DEFAULT};
+ // TODO(nharper): Disable kChannelID on all platforms in M69.
+ const base::Feature kChannelID{"channel-id", base::FEATURE_ENABLED_BY_DEFAULT};
 
 diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h
 --- a/components/network_session_configurator/common/network_features.h
@@ -91,9 +91,9 @@ diff --git a/components/network_session_configurator/common/network_features.h b
 +                 kMaxConnectionsPerHostChoice6[],
 +                 kMaxConnectionsPerHostChoice15[];
 +
- // Enables token binding
- // (https://www.ietf.org/id/draft-ietf-tokbind-protocol-04.txt).
- NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kTokenBinding;
+ // Enables Channel ID.
+ NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kChannelID;
+ 
 diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h
 --- a/components/network_session_configurator/common/network_switch_list.h
 +++ b/components/network_session_configurator/common/network_switch_list.h
@@ -26,7 +26,7 @@ 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
-@@ -52,6 +52,11 @@
+@@ -55,6 +55,11 @@
         android:title="@string/clear_browsing_data_title"
         android:summary="@string/clear_browsing_data_summary"
         android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
@@ -35,21 +35,21 @@ 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" />
-     <org.chromium.chrome.browser.preferences.TextMessageWithLinkAndIconPreference
-         android:key="sync_and_services_link"
-         android:summary="@string/privacy_sync_and_services_link"/>
+     <Preference
+         android:key="sync_and_services_link_divider"
+         android:layout="@layout/divider_preference"
 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
-@@ -36,6 +36,7 @@ import org.chromium.chrome.browser.metrics.MediaNotificationUma;
- import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
+@@ -36,6 +36,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.notifications.NotificationPlatformBridge;
 import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
+ import org.chromium.chrome.browser.profiles.Profile;
 +import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferences;
 import org.chromium.chrome.browser.searchwidget.SearchActivity;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin;
-@@ -274,6 +275,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+@@ -269,6 +270,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
      */
     public static boolean isCustomTabIntent(Intent intent) {
         if (intent == null) return false;
@@ -60,7 +60,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
-@@ -41,6 +41,7 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -42,6 +42,7 @@ public class PrivacyPreferences extends PreferenceFragment
             "safe_browsing_extended_reporting";
     private static final String PREF_SAFE_BROWSING_SCOUT_REPORTING =
             "safe_browsing_scout_reporting";
@@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
     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";
-@@ -134,6 +135,11 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -139,6 +140,11 @@ public class PrivacyPreferences extends PreferenceFragment
                     ? PREF_SAFE_BROWSING_EXTENDED_REPORTING : PREF_SAFE_BROWSING_SCOUT_REPORTING;
         preferenceScreen.removePreference(findPreference(extended_reporting_pref_to_remove));
 
@@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
         ChromeBaseCheckBoxPreference safeBrowsingPref =
                 (ChromeBaseCheckBoxPreference) findPreference(PREF_SAFE_BROWSING);
         safeBrowsingPref.setOnPreferenceChangeListener(this);
-@@ -153,6 +159,10 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -158,6 +164,10 @@ public class PrivacyPreferences extends PreferenceFragment
                    || PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
             PrefServiceBridge.getInstance().setSafeBrowsingExtendedReportingEnabled(
                     (boolean) newValue);
@@ -94,7 +94,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -3615,6 +3615,13 @@ However, you aren’t invisible. Going incognito doesn’t hide your browsing fr
+@@ -3763,6 +3763,13 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from
         Browse
       </message>
 
@@ -4,12 +4,12 @@ Subject: Add privacy option to keep cookies until session exit

 ---
 chrome/android/java/res/values/values.xml          |  3 +++
- .../android/java/res/xml/website_preferences.xml   |  7 +++++++
- .../browser/preferences/PrefServiceBridge.java     | 10 ++++++++++
- .../website/SingleCategoryPreferences.java         | 23 ++++++++++++++++++++++
+ .../android/java/res/xml/website_preferences.xml   |  7 ++++++
+ .../browser/preferences/PrefServiceBridge.java     | 10 +++++++++
+ .../website/SingleCategoryPreferences.java         | 21 +++++++++++++++++-
 .../java/strings/android_chrome_strings.grd        |  6 ++++++
- .../android/preferences/pref_service_bridge.cc     | 19 ++++++++++++++++++
- 6 files changed, 68 insertions(+)
+ .../android/preferences/pref_service_bridge.cc     | 25 ++++++++++++++++++++++
+ 6 files changed, 71 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
@@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/xml/website_preferences.xml b/chrome/android/java/res/xml/website_preferences.xml
 --- a/chrome/android/java/res/xml/website_preferences.xml
 +++ b/chrome/android/java/res/xml/website_preferences.xml
-@@ -19,6 +19,13 @@
+@@ -26,6 +26,13 @@
         android:summary="@string/allow_third_party_cookies_summary"
         android:defaultValue="true"
         android:persistent="false" />
@@ -66,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
     public void setDoNotTrackEnabled(boolean enabled) {
         nativeSetDoNotTrackEnabled(enabled);
     }
-@@ -1026,6 +1034,7 @@ public class PrefServiceBridge {
+@@ -1072,6 +1080,7 @@ public class PrefServiceBridge {
     private native boolean nativeGetAutoplayEnabled();
     private native boolean nativeGetBackgroundSyncEnabled();
     private native boolean nativeGetBlockThirdPartyCookiesEnabled();
@@ -74,7 +74,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
     private native boolean nativeGetBlockThirdPartyCookiesManaged();
     private native boolean nativeGetRememberPasswordsEnabled();
     private native boolean nativeGetPasswordManagerAutoSigninEnabled();
-@@ -1073,6 +1082,7 @@ public class PrefServiceBridge {
+@@ -1118,6 +1127,7 @@ public class PrefServiceBridge {
     private native void nativeSetAllowCookiesEnabled(boolean allow);
     private native void nativeSetBackgroundSyncEnabled(boolean allow);
     private native void nativeSetBlockThirdPartyCookiesEnabled(boolean enabled);
@@ -85,15 +85,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
-@@ -104,6 +104,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
-     // Keys for individual preferences.
-     public static final String READ_WRITE_TOGGLE_KEY = "read_write_toggle";
+@@ -110,6 +110,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
+ 
+     // Keys for category-specific preferences (toggle, link, button etc.), dynamically shown.
     public static final String THIRD_PARTY_COOKIES_TOGGLE_KEY = "third_party_cookies";
 +    public static final String COOKIES_SESSION_ONLY_TOGGLE_KEY = "cookies_session_only";
     public static final String NOTIFICATIONS_VIBRATE_TOGGLE_KEY = "notifications_vibrate";
     public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more";
     private static final String ADD_EXCEPTION_KEY = "add_exception";
-@@ -459,6 +460,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
+@@ -460,6 +461,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
 
                 if (type == SiteSettingsCategory.Type.COOKIES) {
                     updateThirdPartyCookiesCheckBox();
@@ -101,33 +101,50 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
                 } else if (type == SiteSettingsCategory.Type.NOTIFICATIONS) {
                     updateNotificationsVibrateCheckBox();
                 }
-@@ -491,6 +493,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
+@@ -498,6 +500,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
             getInfoForOrigins();
         } else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) {
-             PrefServiceBridge.getInstance().setBlockThirdPartyCookiesEnabled(!((boolean) newValue));
+             prefServiceBridge.setBlockThirdPartyCookiesEnabled(!((boolean) newValue));
 +        } else if (COOKIES_SESSION_ONLY_TOGGLE_KEY.equals(preference.getKey())) {
-+            PrefServiceBridge.getInstance().setCookiesSessionOnlyEnabled(!((boolean) newValue));
+            prefServiceBridge.setCookiesSessionOnlyEnabled((boolean) newValue);
         } else if (NOTIFICATIONS_VIBRATE_TOGGLE_KEY.equals(preference.getKey())) {
-             PrefServiceBridge.getInstance().setNotificationsVibrateEnabled((boolean) newValue);
+             prefServiceBridge.setNotificationsVibrateEnabled((boolean) newValue);
         }
-@@ -734,6 +738,16 @@ public class SingleCategoryPreferences extends PreferenceFragment
-             getPreferenceScreen().removePreference(thirdPartyCookies);
-         }
- 
-+        // Configure/hide the keep cookies until session is over toggle, as needed.
+@@ -754,6 +758,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
+         TriStateSiteSettingsPreference triStateToggle =
+                 (TriStateSiteSettingsPreference) screen.findPreference(TRI_STATE_TOGGLE_KEY);
+         Preference thirdPartyCookies = screen.findPreference(THIRD_PARTY_COOKIES_TOGGLE_KEY);
 +        Preference cookiesSessionOnly = getPreferenceScreen().findPreference(
 +                COOKIES_SESSION_ONLY_TOGGLE_KEY);
-+        if (mCategory.showSites(SiteSettingsCategory.Type.COOKIES)) {
+         Preference notificationsVibrate = screen.findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY);
+         Preference explainProtectedMediaKey = screen.findPreference(EXPLAIN_PROTECTED_MEDIA_KEY);
+         PreferenceGroup allowedGroup = (PreferenceGroup) screen.findPreference(ALLOWED_GROUP);
+@@ -768,6 +774,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
+             screen.removePreference(binaryToggle);
+             screen.removePreference(triStateToggle);
+             screen.removePreference(thirdPartyCookies);
+            screen.removePreference(cookiesSessionOnly);
+             screen.removePreference(notificationsVibrate);
+             screen.removePreference(explainProtectedMediaKey);
+             screen.removePreference(allowedGroup);
+@@ -803,12 +810,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
+             configureBinaryToggle(binaryToggle, contentType);
+         }
+ 
+-        // Configure/hide the third-party cookie toggle, as needed.
+        // Configure/hide the third-party cookie toggle and session-only cookie toggle, as needed.
+         if (mCategory.showSites(SiteSettingsCategory.Type.COOKIES)) {
+             thirdPartyCookies.setOnPreferenceChangeListener(this);
+             updateThirdPartyCookiesCheckBox();
 +            cookiesSessionOnly.setOnPreferenceChangeListener(this);
 +            updateCookiesSessionOnlyCheckBox();
-+        } else {
-+            getPreferenceScreen().removePreference(cookiesSessionOnly);
-+        }
-+
+         } else {
+             screen.removePreference(thirdPartyCookies);
+            screen.removePreference(cookiesSessionOnly);
+         }
+ 
         // Configure/hide the notifications vibrate toggle, as needed.
-         Preference notificationsVibrate =
-                 getPreferenceScreen().findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY);
-@@ -847,6 +861,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
+@@ -894,6 +904,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
                 preference -> PrefServiceBridge.getInstance().isBlockThirdPartyCookiesManaged());
     }
 
@@ -135,7 +152,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
 +        ChromeBaseCheckBoxPreference cookiesSessionOnlyPref = (ChromeBaseCheckBoxPreference)
 +                getPreferenceScreen().findPreference(COOKIES_SESSION_ONLY_TOGGLE_KEY);
 +        cookiesSessionOnlyPref.setChecked(
-+                !PrefServiceBridge.getInstance().isCookiesSessionOnlyEnabled());
+                PrefServiceBridge.getInstance().isCookiesSessionOnlyEnabled());
 +        cookiesSessionOnlyPref.setEnabled(PrefServiceBridge.getInstance().isCategoryEnabled(
 +                ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES));
 +    }
@@ -146,7 +163,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -861,6 +861,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -882,6 +882,12 @@ Your Google account may have other forms of browsing history like searches and a
       <message name="IDS_ALLOW_THIRD_PARTY_COOKIES_SUMMARY" desc="Summary text for Allow Third Party Cookies preference">
         Third-party websites can save and read cookie data
       </message>
@@ -162,7 +179,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
 diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
 --- a/chrome/browser/android/preferences/pref_service_bridge.cc
 +++ b/chrome/browser/android/preferences/pref_service_bridge.cc
-@@ -282,6 +282,14 @@ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesEnabled(
+@@ -304,6 +304,17 @@ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesEnabled(
   return GetPrefService()->GetBoolean(prefs::kBlockThirdPartyCookies);
 }
 
@@ -171,13 +188,16 @@ diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/
 +    const JavaParamRef<jobject>& obj) {
 +  HostContentSettingsMap* host_content_settings_map =
 +      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
-+  return CONTENT_SETTING_SESSION_ONLY == host_content_settings_map->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, nullptr);
+  auto value = host_content_settings_map->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, nullptr);
+  auto enabled = CONTENT_SETTING_SESSION_ONLY == value;
+  LOG(INFO) << "GetCookiesSessionOnly := " << enabled << " (raw_value = " << value << ")";
+  return enabled;
 +}
 +
 static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesManaged(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
-@@ -741,6 +749,17 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled(
+@@ -756,6 +767,20 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled(
   GetPrefService()->SetBoolean(prefs::kBlockThirdPartyCookies, enabled);
 }
 
@@ -187,9 +207,12 @@ diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/
 +    jboolean enabled) {
 +  HostContentSettingsMap* host_content_settings_map =
 +      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
+  LOG(INFO) << "SetCookiesSessionOnly -> " << (enabled ? "true" : "false") <<
+           "; false -> setting_allow: " << CONTENT_SETTING_ALLOW <<
+           "; true -> session_only: "   << CONTENT_SETTING_SESSION_ONLY;
 +  host_content_settings_map->SetDefaultContentSetting(
 +      CONTENT_SETTINGS_TYPE_COOKIES,
-+      enabled ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_SESSION_ONLY);
+      enabled ? CONTENT_SETTING_SESSION_ONLY : CONTENT_SETTING_ALLOW);
 +}
 +
 static void JNI_PrefServiceBridge_SetRememberPasswordsEnabled(
@@ -9,9 +9,9 @@ Subject: Always allow partner customisation
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
-@@ -243,14 +243,14 @@ public class PartnerBrowserCustomizations {
+@@ -242,14 +242,14 @@ public class PartnerBrowserCustomizations {
             @Override
-             protected Void doInBackground(Void... params) {
+             protected Void doInBackground() {
                 try {
 -                    boolean systemOrPreStable =
 -                            (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1
@@ -2,24 +2,25 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Wed, 1 Aug 2018 09:19:40 +0200
 Subject: Add bookmark import/export actions in bookmarks activity and page

+Thanks to Arnaud for the snippet on how to add toast notifications
 ---
 .../java/res/menu/bookmark_action_bar_menu.xml     |  14 ++
 .../browser/bookmarks/BookmarkActionBar.java       |  12 ++
 .../chrome/browser/bookmarks/BookmarkActivity.java |  19 ++
- .../chrome/browser/bookmarks/BookmarkBridge.java   |  21 ++
+ .../chrome/browser/bookmarks/BookmarkBridge.java   |  55 ++++++
 .../chrome/browser/bookmarks/BookmarkDelegate.java |  10 +
 .../chrome/browser/bookmarks/BookmarkManager.java  |  20 ++
 .../chrome/browser/bookmarks/BookmarkPage.java     |   1 +
 .../java/strings/android_chrome_strings.grd        |   6 +
 chrome/browser/BUILD.gn                            |   8 +-
- .../browser/android/bookmarks/bookmark_bridge.cc   | 219 +++++++++++++++++++++
- chrome/browser/android/bookmarks/bookmark_bridge.h |  19 +-
+ .../browser/android/bookmarks/bookmark_bridge.cc   | 215 +++++++++++++++++++++
+ chrome/browser/android/bookmarks/bookmark_bridge.h |  20 +-
 chrome/browser/importer/profile_writer.cc          |   2 +
 chrome/common/BUILD.gn                             |   3 +
 chrome/utility/BUILD.gn                            |   7 +-
 chrome/utility/importer/bookmark_html_reader.cc    |  27 ++-
 chrome/utility/importer/bookmark_html_reader.h     |   9 +
- 16 files changed, 387 insertions(+), 10 deletions(-)
+ 16 files changed, 418 insertions(+), 10 deletions(-)

 diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
 --- a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
@@ -48,7 +49,7 @@ diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
-@@ -82,6 +82,12 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -89,6 +89,12 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
         } else if (menuItem.getItemId() == R.id.search_menu_id) {
             mDelegate.openSearchUI();
             return true;
@@ -61,7 +62,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
         }
 
         SelectionDelegate<BookmarkId> selectionDelegate = mDelegate.getSelectionDelegate();
-@@ -125,6 +131,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -132,6 +138,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
     void showLoadingUi() {
         setTitle(null);
         setNavigationButton(NAVIGATION_BUTTON_NONE);
@@ -70,7 +71,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
         getMenu().findItem(R.id.search_menu_id).setVisible(false);
         getMenu().findItem(R.id.edit_menu_id).setVisible(false);
     }
-@@ -134,6 +142,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -141,6 +149,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
         super.showNormalView();
 
         if (mDelegate == null) {
@@ -79,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
             getMenu().findItem(R.id.search_menu_id).setVisible(false);
             getMenu().findItem(R.id.edit_menu_id).setVisible(false);
         }
-@@ -166,6 +176,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -173,6 +183,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
     public void onFolderStateSet(BookmarkId folder) {
         mCurrentFolder = mDelegate.getModel().getBookmarkById(folder);
 
@@ -141,15 +142,36 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
-@@ -18,6 +18,7 @@ import org.chromium.chrome.browser.profiles.Profile;
+@@ -4,7 +4,11 @@
+ 
+ package org.chromium.chrome.browser.bookmarks;
+ 
+import android.content.Intent;
+import android.content.Context;
+import android.net.Uri;
+ import android.os.SystemClock;
+import android.provider.Browser;
+ import android.text.TextUtils;
+ import android.util.Pair;
+ 
+@@ -13,11 +17,16 @@ import org.chromium.base.ObserverList;
+ import org.chromium.base.VisibleForTesting;
+ import org.chromium.base.annotations.CalledByNative;
+ import org.chromium.base.metrics.RecordHistogram;
+import org.chromium.chrome.browser.document.ChromeLauncherActivity;
+import org.chromium.chrome.browser.IntentHandler;
+ import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
+ import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkType;
 import org.chromium.components.url_formatter.UrlFormatter;
+import org.chromium.ui.base.PageTransition;
 +import org.chromium.ui.base.WindowAndroid;
+import org.chromium.ui.widget.Toast;
 
 import java.util.ArrayList;
 import java.util.List;
-@@ -508,6 +509,24 @@ public class BookmarkBridge {
+@@ -508,6 +517,24 @@ public class BookmarkBridge {
     }
 
     /**
@@ -174,7 +196,40 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      * Synchronously gets a list of bookmarks that match the specified search query.
      * @param query Keyword used for searching bookmarks.
      * @param maxNumberOfResult Maximum number of result to fetch.
-@@ -906,6 +925,8 @@ public class BookmarkBridge {
+@@ -840,6 +867,32 @@ public class BookmarkBridge {
+         depthList.add(depth);
+     }
+ 
+
+    @CalledByNative
+    public void bookmarksImported() {
+        Context context = ContextUtils.getApplicationContext();
+
+        Toast.makeText(ContextUtils.getApplicationContext(), "Bookmarks imported", Toast.LENGTH_LONG).show();
+    }
+
+    @CalledByNative
+    public void bookmarksExported(String bookmarksPath) {
+        Context context = ContextUtils.getApplicationContext();
+
+        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("file://" + bookmarksPath));
+        intent.putExtra(Browser.EXTRA_APPLICATION_ID,
+                        context.getPackageName());
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra(IntentHandler.EXTRA_PAGE_TRANSITION_TYPE, PageTransition.AUTO_BOOKMARK);
+
+        // If the bookmark manager is shown in a tab on a phone (rather than in a separate
+        // activity) the component name may be null. Send the intent through
+        // ChromeLauncherActivity instead to avoid crashing. See crbug.com/615012.
+        intent.setClass(context, ChromeLauncherActivity.class);
+
+        IntentHandler.startActivityForTrustedIntent(intent);
+    }
+
+     private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
+         List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>();
+         for (int i = 0; i < left.length; i++) {
+@@ -906,6 +959,8 @@ public class BookmarkBridge {
             boolean getFolders, boolean getBookmarks, List<BookmarkId> bookmarksList);
     private native BookmarkId nativeGetChildAt(long nativeBookmarkBridge, long id, int type,
             int index);
@@ -206,14 +261,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
-@@ -22,6 +22,7 @@ import org.chromium.chrome.R;
- import org.chromium.chrome.browser.BasicNativePage;
+@@ -21,6 +21,7 @@ import org.chromium.base.metrics.RecordUserAction;
+ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserver;
 +import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.favicon.LargeIconBridge;
+ import org.chromium.chrome.browser.native_page.BasicNativePage;
 import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksReader;
- import org.chromium.chrome.browser.profiles.Profile;
@@ -31,6 +32,7 @@ import org.chromium.chrome.browser.widget.selection.SelectableListLayout;
 import org.chromium.chrome.browser.widget.selection.SelectableListToolbar.SearchDelegate;
 import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
@@ -275,7 +330,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -209,6 +209,12 @@ CHAR-LIMIT guidelines:
+@@ -218,6 +218,12 @@ CHAR-LIMIT guidelines:
       <message name="IDS_SEARCH" desc="The label for a search button.">
         Search
       </message>
@@ -291,7 +346,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -137,6 +137,10 @@ jumbo_split_static_library("browser") {
+@@ -140,6 +140,10 @@ jumbo_split_static_library("browser") {
     "bitmap_fetcher/bitmap_fetcher_service.h",
     "bitmap_fetcher/bitmap_fetcher_service_factory.cc",
     "bitmap_fetcher/bitmap_fetcher_service_factory.h",
@@ -302,7 +357,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
     "bookmarks/bookmark_model_factory.cc",
     "bookmarks/bookmark_model_factory.h",
     "bookmarks/bookmark_stats.cc",
-@@ -2479,8 +2483,6 @@ jumbo_split_static_library("browser") {
+@@ -2537,8 +2541,6 @@ jumbo_split_static_library("browser") {
       "banners/app_banner_infobar_delegate_desktop.h",
       "banners/app_banner_manager_desktop.cc",
       "banners/app_banner_manager_desktop.h",
@@ -311,7 +366,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
       "certificate_viewer.h",
       "chrome_browser_field_trials_desktop.cc",
       "chrome_browser_field_trials_desktop.h",
-@@ -2569,8 +2571,6 @@ jumbo_split_static_library("browser") {
+@@ -2627,8 +2629,6 @@ jumbo_split_static_library("browser") {
       "importer/importer_uma.h",
       "importer/in_process_importer_bridge.cc",
       "importer/in_process_importer_bridge.h",
@@ -437,7 +492,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 }
 
 void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef<jobject>&) {
-@@ -470,6 +539,156 @@ jint BookmarkBridge::GetTotalBookmarkCount(
+@@ -470,6 +539,152 @@ jint BookmarkBridge::GetTotalBookmarkCount(
   return count;
 }
 
@@ -445,6 +500,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 +                                       const JavaParamRef<jobject>& obj,
 +                                       const JavaParamRef<jobject>& java_window) {
 +  DCHECK(IsLoaded());
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 +
 +  ui::WindowAndroid* window =
 +      ui::WindowAndroid::FromJavaWindowAndroid(java_window);
@@ -462,39 +518,39 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 +  file_type_info.allowed_paths =
 +      ui::SelectFileDialog::FileTypeInfo::NATIVE_OR_DRIVE_PATH;
 +
-+  const base::FilePath file_path;
-+
 +  select_file_dialog_->SelectFile(
 +        ui::SelectFileDialog::SELECT_OPEN_FILE,
 +        base::string16(),
-+        file_path,
-+        NULL,
+        import_path_,
+        &file_type_info,
 +        0,
 +        base::FilePath::StringType(),
 +        window,
 +        NULL);
-+}
 +
-+void ExporterCallback(Profile* profile, const base::FilePath& path) {
-+  bookmark_html_writer::WriteBookmarks(profile, path, NULL);
-+  //NOTE: nothing will be written if write permission has not been granted before
-+  LOG(INFO) << "Bookmarks exported successfully in " << path;
+  //NOTE: this should be called after the actual import
+  Java_BookmarkBridge_bookmarksImported(env, obj);
 +}
 +
 +void BookmarkBridge::ExportBookmarks(JNIEnv* env,
 +                                       const JavaParamRef<jobject>& obj) {
 +  DCHECK(IsLoaded());
-+  base::FilePath path;
-+  if (!base::android::GetDownloadsDirectory(&path)) {
-+    LOG(ERROR) << "Could not retrieve downloads directory for bookmarks export";
-+    return;
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+  if (import_path_.empty()) {
+    if (!base::android::GetDownloadsDirectory(&import_path_)) {
+      LOG(ERROR) << "Could not retrieve downloads directory for bookmarks export";
+      return;
+    }
+    import_path_ = import_path_.Append(FILE_PATH_LITERAL("bookmarks.html"));
 +  }
 +
-+  path = path.Append(FILE_PATH_LITERAL("bookmarks.html"));
+  bookmark_html_writer::WriteBookmarks(profile_, import_path_, NULL);
 +
-+//  base::PostTaskWithTraits(FROM_HERE, {base::MayBlock()},
-+//                            base::BindOnce(&ExporterCallback, profile_, path));
-+  ExporterCallback(profile_, path);
+  //NOTE: nothing will be written if write permission has not been granted before
+  LOG(INFO) << "Bookmarks exported successfully in " << import_path_;
+
+  Java_BookmarkBridge_bookmarksExported(env, obj, ConvertUTF8ToJavaString(env, import_path_.MaybeAsASCII()));
 +}
 +
 +// Attempts to create a TemplateURL from the provided data. |title| is optional.
@@ -513,40 +569,6 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 +  return std::make_unique<TemplateURL>(data);
 +}
 +
-+void ImporterCallback(Profile* profile, const base::FilePath& path, const std::string& contents) {
-+  // this import logic comes from BookmarksFileImporter class
-+  std::vector<ImportedBookmarkEntry> bookmarks;
-+  std::vector<importer::SearchEngineInfo> search_engines;
-+
-+  bookmark_html_reader::ImportBookmarksFile(
-+      base::Callback<bool(void)>(),
-+      base::Bind(internal::CanImportURL),
-+      contents,
-+      &bookmarks,
-+      &search_engines,
-+      nullptr);
-+
-+  // writing to profile will begin extensive changes and use the same bookmarks model for persisting changes
-+  auto *writer = new ProfileWriter(profile);
-+
-+  if (!bookmarks.empty()) {
-+    writer->AddBookmarks(bookmarks, base::ASCIIToUTF16("Imported"));
-+  }
-+  if (!search_engines.empty()) {
-+    TemplateURLService::OwnedTemplateURLVector owned_template_urls;
-+    for (const auto& search_engine : search_engines) {
-+      std::unique_ptr<TemplateURL> owned_template_url = CreateTemplateURL(
-+          search_engine.url, search_engine.keyword, search_engine.display_name);
-+      if (owned_template_url)
-+        owned_template_urls.push_back(std::move(owned_template_url));
-+    }
-+    writer->AddKeywords(std::move(owned_template_urls), false);
-+  }
-+
-+  LOG(INFO) << "Imported " << bookmarks.size() << " bookmarks and " <<
-+		search_engines.size() << " search engines from " << path;
-+}
-+
 +void BookmarkBridge::FileSelected(const base::FilePath& path, int index,
 +                            void* params) {
 +  base::File file;
@@ -582,10 +604,39 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 +    return;
 +  }
 +
-+  std::string content(buffer.begin(), buffer.end());
-+//  base::PostTaskWithTraits(FROM_HERE, {base::MayBlock()},
-+//                            base::BindOnce(&ImporterCallback, profile_, path, content));
-+  ImporterCallback(profile_, path, content);
+  std::string contents(buffer.begin(), buffer.end());
+
+  // the following import logic comes from BookmarksFileImporter class
+  std::vector<ImportedBookmarkEntry> bookmarks;
+  std::vector<importer::SearchEngineInfo> search_engines;
+
+  bookmark_html_reader::ImportBookmarksFile(
+      base::Callback<bool(void)>(),
+      base::Bind(internal::CanImportURL),
+      contents,
+      &bookmarks,
+      &search_engines,
+      nullptr);
+
+  // writing to profile will begin extensive changes and use the same bookmarks model for persisting changes
+  auto *writer = new ProfileWriter(profile_);
+
+  if (!bookmarks.empty()) {
+    writer->AddBookmarks(bookmarks, base::ASCIIToUTF16("Imported"));
+  }
+  if (!search_engines.empty()) {
+    TemplateURLService::OwnedTemplateURLVector owned_template_urls;
+    for (const auto& search_engine : search_engines) {
+      std::unique_ptr<TemplateURL> owned_template_url = CreateTemplateURL(
+          search_engine.url, search_engine.keyword, search_engine.display_name);
+      if (owned_template_url)
+        owned_template_urls.push_back(std::move(owned_template_url));
+    }
+    writer->AddKeywords(std::move(owned_template_urls), false);
+  }
+
+  LOG(INFO) << "Imported " << bookmarks.size() << " bookmarks and " <<
+		search_engines.size() << " search engines from " << import_path_;
 +}
 +
 +void BookmarkBridge::FileSelectionCanceled(void* params) {
@@ -643,7 +694,14 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser
   void SetBookmarkTitle(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& obj,
                         jlong id,
-@@ -267,6 +283,7 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+@@ -261,12 +277,14 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+   void ShimBeingDeleted(PartnerBookmarksShim* shim) override;
+ 
+   Profile* profile_;
+  base::FilePath import_path_;
+   JavaObjectWeakGlobalRef weak_java_ref_;
+   bookmarks::BookmarkModel* bookmark_model_;  // weak
+   bookmarks::ManagedBookmarkService* managed_bookmark_service_;  // weak
   std::unique_ptr<bookmarks::ScopedGroupBookmarkActions>
       grouped_bookmark_actions_;
   PrefChangeRegistrar pref_change_registrar_;
@@ -672,7 +730,7 @@ diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -436,6 +436,9 @@ static_library("common") {
+@@ -443,6 +443,9 @@ static_library("common") {
     sources += [
       "media/chrome_media_drm_bridge_client.cc",
       "media/chrome_media_drm_bridge_client.h",
@@ -685,7 +743,7 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
-@@ -55,8 +55,6 @@ static_library("utility") {
+@@ -58,8 +58,6 @@ static_library("utility") {
 
   if (!is_android) {
     sources += [
@@ -694,7 +752,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
       "importer/bookmarks_file_importer.cc",
       "importer/bookmarks_file_importer.h",
       "importer/edge_database_reader_win.cc",
-@@ -158,6 +156,11 @@ static_library("utility") {
+@@ -162,6 +160,11 @@ static_library("utility") {
     ]
   }
 
@@ -26,7 +26,7 @@ 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
-@@ -15,6 +15,11 @@
+@@ -18,6 +18,11 @@
         android:summary="@string/search_suggestions_summary"
         android:defaultValue="true" />
     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
@@ -41,7 +41,7 @@ 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/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1037,8 +1037,10 @@ public class ChromeTabbedActivity
+@@ -1023,8 +1023,10 @@ public class ChromeTabbedActivity
             boolean hadCipherData =
                     CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
 
@@ -72,7 +72,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeFeatureList;
-@@ -46,6 +48,7 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -47,6 +49,7 @@ public class PrivacyPreferences extends PreferenceFragment
     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 = "network_predictions";
@@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
     private static final String PREF_DO_NOT_TRACK = "do_not_track";
     private static final String PREF_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports";
     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
-@@ -145,6 +148,11 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -150,6 +153,11 @@ public class PrivacyPreferences extends PreferenceFragment
         safeBrowsingPref.setOnPreferenceChangeListener(this);
         safeBrowsingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 
@@ -92,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
         updateSummaries();
     }
 
-@@ -171,6 +179,12 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -176,6 +184,12 @@ public class PrivacyPreferences extends PreferenceFragment
         } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
             PrefServiceBridge.getInstance().setBoolean(
                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
@@ -108,9 +108,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -3655,6 +3655,12 @@ However, you aren’t invisible. Going incognito doesn’t hide your browsing fr
-       <message name="IDS_NEAR_OOM_INTERVENTION_DECLINE" desc="The text of the button letting the user decline the browser's intervention, so that the page can resume what it was doing.">
-          Resume
+@@ -3655,6 +3655,12 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from
+       <message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
+         IMAGE
       </message>
 +      <message name="IDS_CLOSE_TABS_ON_EXIT_TITLE" desc="Text for 'Close tabs on exit' settings-privacy option.">
 +        Close all open tabs on exit
@@ -118,9 +118,9 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
 +      <message name="IDS_CLOSE_TABS_ON_EXIT_SUMMARY" desc="Summary text for 'Close tabs on exit' settings-privacy option.">
 +        Don't persist tabs between browsing sessions
 +      </message>
-     </messages>
-   </release>
- </grit>
+       <message name="IDS_CONTEXTMENU_LINK_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the link.">
+         LINK
+       </message>
 -- 
 2.11.0

@@ -1,6 +1,6 @@
 From: Ryan Archer <ryan.bradley.archer@gmail.com>
 Date: Wed, 2 Aug 2017 01:41:28 -0400
-Subject: Add an always-incognito mode.
+Subject: Add an always-incognito mode

 More specifically, add a preference that causes all new tabs and all
 clicked links to launch as incognito.
@@ -9,17 +9,17 @@ clicked links to launch as incognito.
 .../browser/AlwaysIncognitoLinkInterceptor.java    | 72 ++++++++++++++++++++++
 .../chromium/chrome/browser/ChromeActivity.java    |  4 ++
 .../chrome/browser/appmenu/AppMenuHandler.java     | 12 ++++
- .../contextmenu/ChromeContextMenuPopulator.java    |  7 +++
+ .../contextmenu/ChromeContextMenuPopulator.java    |  9 ++-
 .../chrome/browser/tabmodel/ChromeTabCreator.java  | 24 +++++++-
 .../java/strings/android_chrome_strings.grd        |  6 ++
 chrome/android/java_sources.gni                    |  1 +
- 8 files changed, 130 insertions(+), 1 deletion(-)
+ 8 files changed, 131 insertions(+), 2 deletions(-)
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java

 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
-@@ -20,6 +20,11 @@
+@@ -23,6 +23,11 @@
         android:summary="@string/close_tabs_on_exit_summary"
         android:defaultValue="false" />
     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
@@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
     private ProfileSyncService.SyncStateChangedListener mSyncStateChangedListener;
 
     private ChromeFullscreenManager mFullscreenManager;
-@@ -1630,6 +1631,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -1627,6 +1628,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             throw new IllegalStateException(
                     "Attempting to access TabCreator before initialization");
         }
@@ -168,34 +168,36 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
-@@ -14,6 +14,7 @@ import android.view.ContextMenu;
- import android.webkit.MimeTypeMap;
+@@ -14,6 +14,7 @@ import android.webkit.MimeTypeMap;
 
- import org.chromium.base.CollectionUtil;
-+import org.chromium.base.ContextUtils;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.metrics.RecordHistogram;
+import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
-@@ -45,6 +46,7 @@ import java.util.Set;
-  */
- public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+ import org.chromium.chrome.browser.ChromeFeatureList;
+ import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
+@@ -43,6 +44,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
     private static final String TAG = "CCMenuPopulator";
+     private final ContextMenuItemDelegate mDelegate;
+     private final @ContextMenuMode int mMode;
 +    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
-     private static final ShareContextMenuItem SHARE_IMAGE =
-             new ShareContextMenuItem(R.drawable.ic_share_white_24dp,
-                     R.string.contextmenu_share_image, R.id.contextmenu_share_image, false);
-@@ -479,6 +481,11 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
-             disabledOptions.add(ChromeContextMenuItem.OPEN_IN_INCOGNITO_TAB);
-         }
 
-+        if (ContextUtils.getAppSharedPreferences().getBoolean(PREF_ALWAYS_INCOGNITO, false)
-+                && !mDelegate.isIncognito()) {
-+            disabledOptions.add(ChromeContextMenuItem.OPEN_IN_NEW_TAB);
-+        }
-+
-         if (params.getLinkText().trim().isEmpty() || params.isImage()) {
-             disabledOptions.add(ChromeContextMenuItem.COPY_LINK_TEXT);
-         }
+     /**
+      * Defines the Groups of each Context Menu Item
+@@ -246,7 +248,12 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+             if (FirstRunStatus.getFirstRunFlowComplete() && mMode == ContextMenuMode.NORMAL
+                     && !isEmptyUrl(params.getUrl())
+                     && UrlUtilities.isAcceptedScheme(params.getUrl())) {
+-                linkTab.add(new ChromeContextMenuItem(Item.OPEN_IN_NEW_TAB));
+                if (ContextUtils.getAppSharedPreferences().getBoolean(PREF_ALWAYS_INCOGNITO, false)
+                       && !mDelegate.isIncognito()) {
+                    // disallow open in new tab
+                } else {
+                    linkTab.add(new ChromeContextMenuItem(Item.OPEN_IN_NEW_TAB));
+                }
+                 if (!mDelegate.isIncognito() && mDelegate.isIncognitoSupported()) {
+                     linkTab.add(new ChromeContextMenuItem(Item.OPEN_IN_INCOGNITO_TAB));
+                 }
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
@@ -284,7 +286,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -676,6 +676,12 @@ CHAR-LIMIT guidelines:
+@@ -691,6 +691,12 @@ CHAR-LIMIT guidelines:
       <message name="IDS_SAFE_BROWSING_SCOUT_REPORTING_SUMMARY" desc="Body text for Chrome setting under 'Help Improve Safe Browsing'. This feature sends small amounts of data to Google about potentially-dangerous pages to help Safe Browsing improve Chrome's protection against malware and phishing.">
         Sends some system information and page content to Google
       </message>
@@ -9,7 +9,7 @@ Subject: Disable plugins enumeration
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -1262,10 +1262,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
+@@ -1219,10 +1219,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
 }
 
 PluginData* LocalFrame::GetPluginData() const {
@@ -10,7 +10,7 @@ Subject: Remove google account access permission on reboot
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -869,8 +869,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
+@@ -924,8 +924,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
   resources = [
     "java/res_template/xml/file_paths.xml",
     "java/res_template/xml/launchershortcuts.xml",
@@ -23,7 +23,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -837,14 +837,14 @@ by a child template that "extends" this file.
+@@ -806,14 +806,14 @@ by a child template that "extends" this file.
         </provider>
 
         <!-- Sync adapter for browser invalidation. -->
@@ -11,7 +11,7 @@ anyway), avoid sending to Google.
 diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
 --- a/net/dns/host_resolver_impl.cc
 +++ b/net/dns/host_resolver_impl.cc
-@@ -108,10 +108,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds;
+@@ -110,10 +110,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds;
 // cached.
 const int kIPv6ProbePeriodMs = 1000;
 
@@ -11,15 +11,15 @@ Disables the autofill download manager (trk:158).
 diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/components/autofill/core/browser/autofill_download_manager.cc
 --- a/components/autofill/core/browser/autofill_download_manager.cc
 +++ b/components/autofill/core/browser/autofill_download_manager.cc
-@@ -41,7 +41,6 @@ namespace autofill {
+@@ -42,7 +42,6 @@ namespace autofill {
 
 namespace {
 
 -const size_t kMaxQueryGetSize = 1400;  // 1.25KB
- const size_t kMaxFormCacheSize = 16;
+ const size_t kAutofillDownloadManagerMaxFormCacheSize = 16;
 const size_t kMaxFieldsPerQueryRequest = 100;
 
-@@ -365,6 +364,7 @@ bool AutofillDownloadManager::StartUploadRequest(
+@@ -415,6 +414,7 @@ bool AutofillDownloadManager::StartUploadRequest(
 
 std::tuple<GURL, std::string> AutofillDownloadManager::GetRequestURLAndMethod(
     const FormRequestData& request_data) const {
@@ -27,7 +27,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com
   std::string method("POST");
   std::string query_str;
 
-@@ -387,6 +387,10 @@ std::tuple<GURL, std::string> AutofillDownloadManager::GetRequestURLAndMethod(
+@@ -437,6 +437,10 @@ std::tuple<GURL, std::string> AutofillDownloadManager::GetRequestURLAndMethod(
   GURL url = autofill_server_url_
                  .Resolve(RequestTypeToString(request_data.request_type))
                  .ReplaceComponents(replacements);
@@ -41,7 +41,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com
 diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -1183,9 +1183,11 @@ AutofillManager::AutofillManager(
+@@ -1147,9 +1147,11 @@ AutofillManager::AutofillManager(
       weak_ptr_factory_(this) {
   DCHECK(driver);
   DCHECK(client_);
@@ -15,7 +15,7 @@ turn it back on.
 diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
 --- a/chrome/browser/extensions/extension_system_impl.cc
 +++ b/chrome/browser/extensions/extension_system_impl.cc
-@@ -207,8 +207,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
+@@ -201,8 +201,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
   // ExtensionService depends on RuntimeData.
   runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_)));
 
@@ -59,7 +59,7 @@ diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrom
 diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc
 +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
-@@ -371,8 +371,10 @@ SafeBrowsingDatabaseManager* SafeBrowsingService::CreateDatabaseManager() {
+@@ -326,8 +326,10 @@ SafeBrowsingUIManager* SafeBrowsingService::CreateUIManager() {
 
 void SafeBrowsingService::RegisterAllDelayedAnalysis() {
 #if defined(FULL_SAFE_BROWSING)
@@ -69,7 +69,7 @@ diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/brow
 +#endif
 }
 
- SafeBrowsingProtocolConfig SafeBrowsingService::GetProtocolConfig() const {
+ V4ProtocolConfig SafeBrowsingService::GetV4ProtocolConfig() const {
 diff --git a/components/security_interstitials/core/safe_browsing_loud_error_ui.cc b/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
 --- a/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
 +++ b/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
@@ -7,12 +7,12 @@ prevents the long-living tracking cookie from being set.

 References: https://github.com/iridium-browser/iridium-browser/issues/37
 ---
- chrome/browser/safe_browsing/client_side_detection_service.cc     | 4 ++--
- .../download_protection/check_client_download_request.cc          | 2 +-
- .../safe_browsing/download_protection/ppapi_download_request.cc   | 2 +-
- chrome/browser/safe_browsing/protocol_manager.cc                  | 8 ++++----
- components/safe_browsing/browser/threat_details_cache.cc          | 1 +
- 5 files changed, 9 insertions(+), 8 deletions(-)
+ chrome/browser/safe_browsing/client_side_detection_service.cc         | 4 ++--
+ .../download_protection/check_client_download_request.cc              | 2 +-
+ .../safe_browsing/download_protection/ppapi_download_request.cc       | 2 +-
+ components/safe_browsing/browser/threat_details_cache.cc              | 1 +
+ components/safe_browsing/db/v4_update_protocol_manager.cc             | 4 ++--
+ 5 files changed, 7 insertions(+), 6 deletions(-)

 diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc
@@ -38,7 +38,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
 diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
 --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
 +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
-@@ -1068,7 +1068,7 @@ void CheckClientDownloadRequest::SendRequest() {
+@@ -1075,7 +1075,7 @@ void CheckClientDownloadRequest::SendRequest() {
   auto resource_request = std::make_unique<network::ResourceRequest>();
   resource_request->url = PPAPIDownloadRequest::GetDownloadRequestUrl();
   resource_request->method = "POST";
@@ -59,45 +59,6 @@ diff --git a/chrome/browser/safe_browsing/download_protection/ppapi_download_req
   loader_ = network::SimpleURLLoader::Create(std::move(resource_request),
                                              traffic_annotation);
   loader_->AttachStringForUpload(client_download_request_data_,
-diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc
--- a/chrome/browser/safe_browsing/protocol_manager.cc
-+++ b/chrome/browser/safe_browsing/protocol_manager.cc
-@@ -282,7 +282,7 @@ void SafeBrowsingProtocolManager::GetFullHash(
-   auto resource_request = std::make_unique<network::ResourceRequest>();
-   resource_request->url = gethash_url;
-   resource_request->method = "POST";
-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
-+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES;
-   auto loader_ptr = network::SimpleURLLoader::Create(
-       std::move(resource_request), traffic_annotation);
-   loader_ptr->AttachStringForUpload(FormatGetHash(prefixes), "text/plain");
-@@ -688,7 +688,7 @@ bool SafeBrowsingProtocolManager::IssueBackupUpdateRequest(
-   auto resource_request = std::make_unique<network::ResourceRequest>();
-   resource_request->url = backup_update_url;
-   resource_request->method = "POST";
-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
-+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES;
-   request_ = network::SimpleURLLoader::Create(std::move(resource_request),
-                                               traffic_annotation);
-   request_->AttachStringForUpload(update_list_data_, "text/plain");
-@@ -719,7 +719,7 @@ void SafeBrowsingProtocolManager::IssueChunkRequest() {
- 
-   auto resource_request = std::make_unique<network::ResourceRequest>();
-   resource_request->url = chunk_url;
-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
-+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES;
-   request_ = network::SimpleURLLoader::Create(
-       std::move(resource_request), kChunkBackupRequestTrafficAnnotation);
-   request_->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
-@@ -777,7 +777,7 @@ void SafeBrowsingProtocolManager::OnGetChunksComplete(
-   auto resource_request = std::make_unique<network::ResourceRequest>();
-   resource_request->url = update_url;
-   resource_request->method = "POST";
-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
-+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES;
-   request_ = network::SimpleURLLoader::Create(
-       std::move(resource_request), kChunkBackupRequestTrafficAnnotation);
-   request_->AttachStringForUpload(update_list_data_, "text/plain");
 diff --git a/components/safe_browsing/browser/threat_details_cache.cc b/components/safe_browsing/browser/threat_details_cache.cc
 --- a/components/safe_browsing/browser/threat_details_cache.cc
 +++ b/components/safe_browsing/browser/threat_details_cache.cc
@@ -109,6 +70,20 @@ diff --git a/components/safe_browsing/browser/threat_details_cache.cc b/componen
                                  net::LOAD_DO_NOT_SAVE_COOKIES;
   current_load_ = network::SimpleURLLoader::Create(std::move(resource_request),
                                                    traffic_annotation);
+diff --git a/components/safe_browsing/db/v4_update_protocol_manager.cc b/components/safe_browsing/db/v4_update_protocol_manager.cc
+--- a/components/safe_browsing/db/v4_update_protocol_manager.cc
+++ b/components/safe_browsing/db/v4_update_protocol_manager.cc
+@@ -343,8 +343,8 @@ void V4UpdateProtocolManager::IssueUpdateRequest() {
+   std::string req_base64 = GetBase64SerializedUpdateRequestProto();
+   GetUpdateUrlAndHeaders(req_base64, &resource_request->url,
+                          &resource_request->headers);
+-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
+-  std::unique_ptr<network::SimpleURLLoader> loader =
+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES;
+ std::unique_ptr<network::SimpleURLLoader> loader =
+       network::SimpleURLLoader::Create(std::move(resource_request),
+                                        traffic_annotation);
+   loader->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
 -- 
 2.11.0

@@ -1,26 +1,25 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 17 Sep 2018 21:59:23 +0200
-Subject: Allow building without safebrowsing
+Date: Tue, 16 Oct 2018 05:22:59 +0200
+Subject: ungoogled-chromium: disable safe browsing

-Contains ungoogled-chromium fixes
 ---
 chrome/browser/BUILD.gn                            |   2 -
 chrome/browser/browser_process.h                   |  16 ---
 chrome/browser/browser_process_impl.cc             |  29 ------
 chrome/browser/browser_process_impl.h              |   6 --
 .../chrome_browsing_data_remover_delegate.cc       |  29 ------
- chrome/browser/chrome_content_browser_client.cc    |  47 +--------
+ chrome/browser/chrome_content_browser_client.cc    |  32 +-----
 .../file_type_policies_component_installer.cc      |  14 ---
- .../download/chrome_download_manager_delegate.cc   |  17 ----
+ .../download/chrome_download_manager_delegate.cc   |  17 ---
 chrome/browser/download/download_commands.cc       |   3 -
- chrome/browser/download/download_item_model.cc     |  20 +---
+ chrome/browser/download/download_item_model.cc     |  10 +-
 chrome/browser/download/download_prefs.cc          |  13 +--
 .../browser/download/download_target_determiner.cc |  24 +----
- .../extensions/api/downloads/downloads_api.cc      |  39 +-------
+ .../extensions/api/downloads/downloads_api.cc      |  39 +------
 .../extensions/api/downloads/downloads_api.h       |  10 --
 .../api/webstore_private/webstore_private_api.cc   |  43 +-------
- .../browser/extensions/blacklist_state_fetcher.cc  |  29 +++---
- .../browser/extensions/blacklist_state_fetcher.h   |   8 +-
+ .../browser/extensions/blacklist_state_fetcher.cc  |  34 +-----
+ .../browser/extensions/blacklist_state_fetcher.h   |   3 -
 .../extensions/webstore_inline_installer.cc        |  38 +------
 .../chrome_resource_dispatcher_host_delegate.cc    |   7 +-
 .../metrics/chrome_metrics_service_client.cc       |   3 -
@@ -30,24 +29,21 @@ Contains ungoogled-chromium fixes
 chrome/browser/safe_browsing/BUILD.gn              |   2 +
 chrome/browser/ssl/captive_portal_blocking_page.cc |   7 +-
 chrome/browser/ssl/cert_report_helper.cc           |   2 -
- chrome/browser/ssl/security_state_tab_helper.cc    |  69 -------------
+ chrome/browser/ssl/security_state_tab_helper.cc    |  72 -------------
 .../chrome_subresource_filter_client.cc            |  14 ---
- chrome/browser/ui/BUILD.gn                         |   2 -
- .../ui/cocoa/download/download_item_controller.mm  |  37 +------
+ chrome/browser/ui/BUILD.gn                         |   1 -
 chrome/browser/ui/tab_helpers.cc                   |   5 -
- .../password_reuse_modal_warning_dialog.cc         |   4 +-
- .../ui/webui/interstitials/interstitial_ui.cc      | 111 ---------------------
+ .../ui/webui/interstitials/interstitial_ui.cc      | 116 ---------------------
 .../webui/md_downloads/md_downloads_dom_handler.cc |  37 -------
 .../webui/md_downloads/md_downloads_dom_handler.h  |  13 ---
- chrome/renderer/chrome_content_renderer_client.cc  |  16 +--
- chrome/renderer/chrome_content_renderer_client.h   |   6 --
+ chrome/renderer/chrome_content_renderer_client.cc  |   1 -
 components/safe_browsing/features.cc               |   2 +-
- 38 files changed, 46 insertions(+), 696 deletions(-)
+ 35 files changed, 25 insertions(+), 637 deletions(-)

 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2512,8 +2512,6 @@ jumbo_split_static_library("browser") {
+@@ -2570,8 +2570,6 @@ jumbo_split_static_library("browser") {
       "download/download_commands.h",
       "download/download_crx_util.cc",
       "download/download_crx_util.h",
@@ -59,7 +55,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 --- a/chrome/browser/browser_process.h
 +++ b/chrome/browser/browser_process.h
-@@ -48,10 +48,6 @@ class NetworkQualityTracker;
+@@ -44,10 +44,6 @@ class NetworkQualityTracker;
 class SharedURLLoaderFactory;
 }
 
@@ -70,7 +66,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 namespace subresource_filter {
 class ContentRulesetService;
 }
-@@ -120,10 +116,6 @@ namespace resource_coordinator {
+@@ -116,10 +112,6 @@ namespace resource_coordinator {
 class TabManager;
 }
 
@@ -81,7 +77,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 // NOT THREAD SAFE, call only from the main thread.
 // These functions shouldn't return NULL unless otherwise noted.
 class BrowserProcess {
-@@ -242,14 +234,6 @@ class BrowserProcess {
+@@ -234,14 +226,6 @@ class BrowserProcess {
   // on this platform (or this is a unit test).
   virtual StatusTray* status_tray() = 0;
 
@@ -107,7 +103,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/ui/browser_dialogs.h"
-@@ -363,8 +362,6 @@ void BrowserProcessImpl::StartTearDown() {
+@@ -362,8 +361,6 @@ void BrowserProcessImpl::StartTearDown() {
   // that URLFetcher operation before going away.)
   metrics_services_manager_.reset();
   intranet_redirect_detector_.reset();
@@ -116,7 +112,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
   network_time_tracker_.reset();
 #if BUILDFLAG(ENABLE_PLUGINS)
   plugins_resource_service_.reset();
-@@ -975,22 +972,6 @@ StatusTray* BrowserProcessImpl::status_tray() {
+@@ -976,22 +973,6 @@ StatusTray* BrowserProcessImpl::status_tray() {
   return status_tray_.get();
 }
 
@@ -139,7 +135,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 subresource_filter::ContentRulesetService*
 BrowserProcessImpl::subresource_filter_ruleset_service() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -1278,16 +1259,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() {
+@@ -1279,16 +1260,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() {
 #endif
 }
 
@@ -159,7 +155,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -157,9 +157,6 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -161,9 +161,6 @@ class BrowserProcessImpl : public BrowserProcess,
   void set_background_mode_manager_for_test(
       std::unique_ptr<BackgroundModeManager> manager) override;
   StatusTray* status_tray() override;
@@ -169,7 +165,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
   subresource_filter::ContentRulesetService*
   subresource_filter_ruleset_service() override;
   optimization_guide::OptimizationGuideService* optimization_guide_service()
-@@ -296,9 +293,6 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -299,9 +296,6 @@ class BrowserProcessImpl : public BrowserProcess,
   std::unique_ptr<BackgroundModeManager> background_mode_manager_;
 #endif
 
@@ -221,7 +217,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -778,30 +778,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
+@@ -797,30 +797,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
   g_io_thread_application_locale.Get() = locale;
 }
 
@@ -261,7 +257,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
         command_line->AppendSwitch(
             switches::kDisableClientSidePhishingDetection);
       }
-@@ -2653,7 +2629,7 @@ void ChromeContentBrowserClient::AllowCertificateError(
+@@ -2657,7 +2633,7 @@ void ChromeContentBrowserClient::AllowCertificateError(
   SSLErrorHandler::HandleSSLError(
       web_contents, cert_error, ssl_info, request_url,
       expired_previous_decision,
@@ -270,7 +266,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
       callback, SSLErrorHandler::BlockingPageReadyCallback());
 }
 
-@@ -2923,8 +2899,6 @@ bool ChromeContentBrowserClient::CanCreateWindow(
+@@ -2927,8 +2903,6 @@ bool ChromeContentBrowserClient::CanCreateWindow(
 void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ -279,8 +275,8 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
   for (size_t i = 0; i < extra_parts_.size(); ++i)
     extra_parts_[i]->ResourceDispatcherHostCreated();
 
-@@ -3961,7 +3935,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
-           switches::kCommittedInterstitials)) {
+@@ -4074,7 +4048,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+   if (base::FeatureList::IsEnabled(features::kSSLCommittedInterstitials)) {
     throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
         handle,
 -        std::make_unique<CertificateReportingServiceCertReporter>(web_contents),
@@ -288,26 +284,6 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
         base::Bind(&SSLErrorHandler::HandleSSLError)));
   }
 
-@@ -4693,18 +4667,5 @@ safe_browsing::UrlCheckerDelegate*
- ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
-     content::ResourceContext* resource_context) {
-   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
-  ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
-  if (!io_data->safe_browsing_enabled()->GetValue())
-    return nullptr;
-
-  // |safe_browsing_service_| may be unavailable in tests.
-  if (safe_browsing_service_ && !safe_browsing_url_checker_delegate_) {
-    safe_browsing_url_checker_delegate_ =
-        base::MakeRefCounted<safe_browsing::UrlCheckerDelegateImpl>(
-            safe_browsing_service_->database_manager(),
-            safe_browsing_service_->ui_manager());
-  }
-
-  return safe_browsing_url_checker_delegate_.get();
-+  return nullptr;
- }
 diff --git a/chrome/browser/component_updater/file_type_policies_component_installer.cc b/chrome/browser/component_updater/file_type_policies_component_installer.cc
 --- a/chrome/browser/component_updater/file_type_policies_component_installer.cc
 +++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc
@@ -335,7 +311,7 @@ diff --git a/chrome/browser/component_updater/file_type_policies_component_insta
 diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
 --- a/chrome/browser/download/chrome_download_manager_delegate.cc
 +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -313,13 +313,6 @@ ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() {
+@@ -314,13 +314,6 @@ ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() {
 
 void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
   download_manager_ = dm;
@@ -349,7 +325,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
 }
 
 #if defined(OS_ANDROID)
-@@ -610,16 +603,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath(
+@@ -611,16 +604,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath(
 
 void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
     base::FilePath* filename) {
@@ -382,24 +358,7 @@ diff --git a/chrome/browser/download/download_commands.cc b/chrome/browser/downl
 diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
 --- a/chrome/browser/download/download_item_model.cc
 +++ b/chrome/browser/download/download_item_model.cc
-@@ -20,8 +20,6 @@
- #include "chrome/browser/download/download_history.h"
- #include "chrome/browser/download/download_stats.h"
- #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/safe_browsing/download_protection/download_feedback_service.h"
-#include "chrome/common/safe_browsing/download_file_types.pb.h"
- #include "chrome/grit/chromium_strings.h"
- #include "chrome/grit/generated_resources.h"
- #include "components/download/public/common/download_danger_type.h"
-@@ -37,7 +35,6 @@
- 
- using base::TimeDelta;
- using download::DownloadItem;
-using safe_browsing::DownloadFileType;
- 
- namespace {
- 
-@@ -69,7 +66,7 @@ class DownloadItemModelData : public base::SupportsUserData::Data {
+@@ -69,7 +69,7 @@ class DownloadItemModelData : public base::SupportsUserData::Data {
 
   // Danger level of the file determined based on the file type and whether
   // there was a user action associated with the download.
@@ -408,7 +367,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
 
   // Whether the download is currently being revived.
   bool is_being_revived_;
-@@ -106,7 +103,7 @@ DownloadItemModelData::DownloadItemModelData()
+@@ -106,7 +106,7 @@ DownloadItemModelData::DownloadItemModelData()
     : should_show_in_shelf_(true),
       was_ui_notified_(false),
       should_prefer_opening_in_browser_(false),
@@ -417,22 +376,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
       is_being_revived_(false) {}
 
 base::string16 InterruptReasonStatusMessage(
-@@ -559,14 +556,7 @@ bool DownloadItemModel::HasSupportedImageMimeType() const {
- }
- 
- bool DownloadItemModel::ShouldAllowDownloadFeedback() const {
-#if defined(FULL_SAFE_BROWSING)
-  if (!IsDangerous())
-    return false;
-  return safe_browsing::DownloadFeedbackService::IsEnabledForDownload(
-      *download_);
-#else
-   return false;
-#endif
- }
- 
- bool DownloadItemModel::ShouldRemoveFromShelfWhenComplete() const {
-@@ -671,13 +661,13 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) {
+@@ -671,13 +671,13 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) {
   data->should_prefer_opening_in_browser_ = preference;
 }
 
@@ -524,7 +468,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/b
 #include "chrome/browser/download/download_file_icon_extractor.h"
 #include "chrome/browser/download/download_open_prompt.h"
 #include "chrome/browser/download/download_prefs.h"
-@@ -1316,9 +1315,6 @@ DownloadsAcceptDangerFunction::DownloadsAcceptDangerFunction() {}
+@@ -1311,9 +1310,6 @@ DownloadsAcceptDangerFunction::DownloadsAcceptDangerFunction() {}
 
 DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
 
@@ -534,7 +478,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/b
 bool DownloadsAcceptDangerFunction::RunAsync() {
   std::unique_ptr<downloads::AcceptDanger::Params> params(
       downloads::AcceptDanger::Params::Create(*args_));
-@@ -1356,40 +1352,7 @@ void DownloadsAcceptDangerFunction::PromptOrWait(int download_id, int retries) {
+@@ -1351,40 +1347,7 @@ void DownloadsAcceptDangerFunction::PromptOrWait(int download_id, int retries) {
     return;
   }
   RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -669,87 +613,78 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
 diff --git a/chrome/browser/extensions/blacklist_state_fetcher.cc b/chrome/browser/extensions/blacklist_state_fetcher.cc
 --- a/chrome/browser/extensions/blacklist_state_fetcher.cc
 +++ b/chrome/browser/extensions/blacklist_state_fetcher.cc
-@@ -31,10 +31,10 @@ BlacklistStateFetcher::~BlacklistStateFetcher() {
+@@ -31,28 +31,9 @@ BlacklistStateFetcher::~BlacklistStateFetcher() {
 void BlacklistStateFetcher::Request(const std::string& id,
                                     const RequestCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 -  if (!safe_browsing_config_) {
 -    if (g_browser_process && g_browser_process->safe_browsing_service()) {
 -      SetSafeBrowsingConfig(
-          g_browser_process->safe_browsing_service()->GetProtocolConfig());
-+  if (true) {
-+    if (false) {
-+      //SetSafeBrowsingConfig(
-+      //    g_browser_process->safe_browsing_service()->GetProtocolConfig());
-     } else {
-       base::ThreadTaskRunnerHandle::Get()->PostTask(
-           FROM_HERE, base::BindOnce(callback, BLACKLISTED_UNKNOWN));
-@@ -47,10 +47,10 @@ void BlacklistStateFetcher::Request(const std::string& id,
-   if (request_already_sent)
-     return;
- 
+-          g_browser_process->safe_browsing_service()->GetV4ProtocolConfig());
+-    } else {
+-      base::ThreadTaskRunnerHandle::Get()->PostTask(
+-          FROM_HERE, base::BindOnce(callback, BLACKLISTED_UNKNOWN));
+-      return;
+-    }
+-  }
+-
+-  bool request_already_sent = base::ContainsKey(callbacks_, id);
+-  callbacks_.insert(std::make_pair(id, callback));
+-  if (request_already_sent)
+-    return;
+-
 -  if (g_browser_process && g_browser_process->safe_browsing_service()) {
 -    url_loader_factory_ =
 -        g_browser_process->safe_browsing_service()->GetURLLoaderFactory();
 -  }
-+  //if (g_browser_process && g_browser_process->safe_browsing_service()) {
-+  //  url_loader_factory_ =
-+  //      g_browser_process->safe_browsing_service()->GetURLLoaderFactory();
-+  //}
- 
-   SendRequest(id);
+-
+-  SendRequest(id);
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, base::BindOnce(callback, BLACKLISTED_UNKNOWN));
+  return;
 }
-@@ -110,13 +110,14 @@ void BlacklistStateFetcher::SendRequest(const std::string& id) {
+ 
+ void BlacklistStateFetcher::SendRequest(const std::string& id) {
+@@ -63,8 +44,7 @@ void BlacklistStateFetcher::SendRequest(const std::string& id) {
+   std::string request_str;
+   request.SerializeToString(&request_str);
+ 
+-  GURL request_url = GURL(safe_browsing::GetReportUrl(
+-      *safe_browsing_config_, "clientreport/crx-list-info"));
+  GURL request_url = GURL();
+   net::NetworkTrafficAnnotationTag traffic_annotation =
+       net::DefineNetworkTrafficAnnotation("extension_blacklist", R"(
+         semantics {
+@@ -111,12 +91,6 @@ void BlacklistStateFetcher::SendRequest(const std::string& id) {
                      base::Unretained(this), fetcher));
 }
 
 -void BlacklistStateFetcher::SetSafeBrowsingConfig(
-    const safe_browsing::SafeBrowsingProtocolConfig& config) {
-  safe_browsing_config_.reset(
-      new safe_browsing::SafeBrowsingProtocolConfig(config));
+-    const safe_browsing::V4ProtocolConfig& config) {
+-  safe_browsing_config_ =
+-      std::make_unique<safe_browsing::V4ProtocolConfig>(config);
 -}
-+//void BlacklistStateFetcher::SetSafeBrowsingConfig(
-+//    const safe_browsing::SafeBrowsingProtocolConfig& config) {
-+//  safe_browsing_config_.reset(
-+//      new safe_browsing::SafeBrowsingProtocolConfig(config));
-+//}
- 
- GURL BlacklistStateFetcher::RequestUrl() const {
-+  /*
-   std::string url = base::StringPrintf(
-       "%s/%s?client=%s&appver=%s&pver=2.2",
-       safe_browsing_config_->url_prefix.c_str(),
-@@ -129,6 +130,8 @@ GURL BlacklistStateFetcher::RequestUrl() const {
-                         net::EscapeQueryParamValue(api_key, true).c_str());
-   }
-   return GURL(url);
-+  */
-+  return GURL();
- }
- 
+-
 void BlacklistStateFetcher::OnURLLoaderComplete(
+     network::SimpleURLLoader* url_loader,
+     std::unique_ptr<std::string> response_body) {
 diff --git a/chrome/browser/extensions/blacklist_state_fetcher.h b/chrome/browser/extensions/blacklist_state_fetcher.h
 --- a/chrome/browser/extensions/blacklist_state_fetcher.h
 +++ b/chrome/browser/extensions/blacklist_state_fetcher.h
-@@ -34,8 +34,8 @@ class BlacklistStateFetcher {
+@@ -34,8 +34,6 @@ class BlacklistStateFetcher {
 
   virtual void Request(const std::string& id, const RequestCallback& callback);
 
-  void SetSafeBrowsingConfig(
-      const safe_browsing::SafeBrowsingProtocolConfig& config);
-+  //void SetSafeBrowsingConfig(
-+  //    const safe_browsing::SafeBrowsingProtocolConfig& config);
- 
+-  void SetSafeBrowsingConfig(const safe_browsing::V4ProtocolConfig& config);
+-
  protected:
   void OnURLLoaderComplete(network::SimpleURLLoader* url_loader,
-@@ -55,8 +55,8 @@ class BlacklistStateFetcher {
+                            std::unique_ptr<std::string> response_body);
+@@ -54,7 +52,6 @@ class BlacklistStateFetcher {
 
   void SendRequest(const std::string& id);
 
-  std::unique_ptr<safe_browsing::SafeBrowsingProtocolConfig>
-      safe_browsing_config_;
-+  //std::unique_ptr<safe_browsing::SafeBrowsingProtocolConfig>
-+  //    safe_browsing_config_;
+-  std::unique_ptr<safe_browsing::V4ProtocolConfig> safe_browsing_config_;
   scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
 
   // SimpleURLLoader -> (owned loader, extension id).
@@ -807,17 +742,17 @@ diff --git a/chrome/browser/extensions/webstore_inline_installer.cc b/chrome/bro
 diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
 --- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
 +++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
-@@ -344,8 +344,7 @@ void LogCommittedPreviewsDecision(
+@@ -330,8 +330,7 @@ void LogCommittedPreviewsDecision(
 }  // namespace
 
 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate()
 -    : download_request_limiter_(g_browser_process->download_request_limiter()),
-      safe_browsing_(g_browser_process->safe_browsing_service())
-+    : download_request_limiter_(g_browser_process->download_request_limiter())
+-      safe_browsing_(g_browser_process->safe_browsing_service()) {}
+    : download_request_limiter_(g_browser_process->download_request_limiter()) {}
+ 
+ ChromeResourceDispatcherHostDelegate::~ChromeResourceDispatcherHostDelegate() {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-       , user_script_listener_(new extensions::UserScriptListener())
- #endif
-@@ -369,8 +368,6 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning(
+@@ -345,8 +344,6 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning(
     content::AppCacheService* appcache_service,
     ResourceType resource_type,
     std::vector<std::unique_ptr<content::ResourceThrottle>>* throttles) {
@@ -826,7 +761,7 @@ diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b
   ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
   client_hints::RequestBeginning(request, io_data->GetCookieSettings());
 
-@@ -499,7 +496,7 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(
+@@ -470,7 +467,7 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(
   content::ResourceThrottle* first_throttle = NULL;
 #if defined(OS_ANDROID)
   first_throttle = DataReductionProxyResourceThrottle::MaybeCreate(
@@ -838,7 +773,7 @@ diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b
 diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
 +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -716,9 +716,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
+@@ -712,9 +712,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
   metrics_service_->RegisterMetricsProvider(
       std::make_unique<HttpsEngagementMetricsProvider>());
 
@@ -851,7 +786,7 @@ diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/br
 diff --git a/chrome/browser/net/trial_comparison_cert_verifier.cc b/chrome/browser/net/trial_comparison_cert_verifier.cc
 --- a/chrome/browser/net/trial_comparison_cert_verifier.cc
 +++ b/chrome/browser/net/trial_comparison_cert_verifier.cc
-@@ -99,9 +99,6 @@ void SendTrialVerificationReport(void* profile_id,
+@@ -79,9 +79,6 @@ void SendTrialVerificationReport(void* profile_id,
   std::string serialized_report;
   if (!report.Serialize(&serialized_report))
     return;
@@ -864,7 +799,7 @@ diff --git a/chrome/browser/net/trial_comparison_cert_verifier.cc b/chrome/brows
 diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -220,7 +220,6 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -228,7 +228,6 @@ void ChromeBrowserMainExtraPartsProfiles::
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
   CaptivePortalServiceFactory::GetInstance();
 #endif
@@ -875,7 +810,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -518,18 +518,6 @@ ProfileImpl::ProfileImpl(
+@@ -541,18 +541,6 @@ ProfileImpl::ProfileImpl(
                                  create_mode == CREATE_MODE_SYNCHRONOUS);
 #endif
 
@@ -894,7 +829,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
   content::BrowserContext::Initialize(this, path_);
 
   {
-@@ -538,7 +526,7 @@ ProfileImpl::ProfileImpl(
+@@ -561,7 +549,7 @@ ProfileImpl::ProfileImpl(
             ->CreateDelegate();
     delegate->InitPrefRegistry(pref_registry_.get());
     prefs_ = chrome_prefs::CreateProfilePrefs(
@@ -906,15 +841,15 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
 diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
-@@ -12,6 +12,7 @@ proto_library("chunk_proto") {
- }
+@@ -6,6 +6,7 @@ import("//extensions/buildflags/buildflags.gni")
+ import("//third_party/protobuf/proto_library.gni")
 
 static_library("safe_browsing") {
 +  if (false) {
   sources = [
     "chrome_cleaner/chrome_cleaner_controller_impl_win.cc",
     "chrome_cleaner/chrome_cleaner_controller_impl_win.h",
-@@ -80,6 +81,7 @@ static_library("safe_browsing") {
+@@ -74,6 +75,7 @@ static_library("safe_browsing") {
   } else {
     sources += [ "chrome_cleaner/chrome_cleaner_extension_util_win_noop.cc" ]
   }
@@ -926,7 +861,7 @@ diff --git a/chrome/browser/ssl/captive_portal_blocking_page.cc b/chrome/browser
 --- a/chrome/browser/ssl/captive_portal_blocking_page.cc
 +++ b/chrome/browser/ssl/captive_portal_blocking_page.cc
@@ -211,10 +211,7 @@ void CaptivePortalBlockingPage::PopulateInterstitialStrings(
-   load_time_data->SetString("recurrentErrorParagraph", base::string16());
+   load_time_data->SetString("recurrentErrorParagraph", "");
   load_time_data->SetBoolean("show_recurrent_error_paragraph", false);
 
 -  if (cert_report_helper())
@@ -961,7 +896,7 @@ diff --git a/chrome/browser/ssl/cert_report_helper.cc b/chrome/browser/ssl/cert_
 diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc
 --- a/chrome/browser/ssl/security_state_tab_helper.cc
 +++ b/chrome/browser/ssl/security_state_tab_helper.cc
-@@ -271,75 +271,6 @@ bool SecurityStateTabHelper::UsedPolicyInstalledCertificate() const {
+@@ -269,78 +269,6 @@ bool SecurityStateTabHelper::UsedPolicyInstalledCertificate() const {
 
 security_state::MaliciousContentStatus
 SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -980,7 +915,6 @@ diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ss
 -    switch (threat_type) {
 -      case safe_browsing::SB_THREAT_TYPE_UNUSED:
 -      case safe_browsing::SB_THREAT_TYPE_SAFE:
-        break;
 -      case safe_browsing::SB_THREAT_TYPE_URL_PHISHING:
 -      case safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING:
 -        return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
@@ -1017,6 +951,10 @@ diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ss
 -        // social engineering content status.
 -        return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
 -#endif
+-      case safe_browsing::SB_THREAT_TYPE_BILLING:
+-        return base::FeatureList::IsEnabled(safe_browsing::kBillingInterstitial)
+-                   ? security_state::MALICIOUS_CONTENT_STATUS_BILLING
+-                   : security_state::MALICIOUS_CONTENT_STATUS_NONE;
 -      case safe_browsing::
 -          DEPRECATED_SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING:
 -      case safe_browsing::SB_THREAT_TYPE_URL_BINARY_MALWARE:
@@ -1040,7 +978,7 @@ diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ss
 diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
 --- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
 +++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
-@@ -71,20 +71,6 @@ void ChromeSubresourceFilterClient::DidStartNavigation(
+@@ -69,20 +69,6 @@ void ChromeSubresourceFilterClient::DidStartNavigation(
 void ChromeSubresourceFilterClient::MaybeAppendNavigationThrottles(
     content::NavigationHandle* navigation_handle,
     std::vector<std::unique_ptr<content::NavigationThrottle>>* throttles) {
@@ -1064,15 +1002,7 @@ diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -2599,7 +2599,6 @@ split_static_library("ui") {
-         "cocoa/content_settings/cookie_tree_node.mm",
-         "cocoa/content_settings/cookies_tree_controller_bridge.h",
-         "cocoa/content_settings/cookies_tree_controller_bridge.mm",
-        "cocoa/download/download_danger_prompt_impl.cc",
-         "cocoa/extensions/chooser_dialog_cocoa.h",
-         "cocoa/extensions/chooser_dialog_cocoa.mm",
-         "cocoa/extensions/chooser_dialog_cocoa_controller.h",
-@@ -2903,7 +2902,6 @@ split_static_library("ui") {
+@@ -2842,7 +2842,6 @@ jumbo_split_static_library("ui") {
       "views/cookie_info_view.h",
       "views/device_chooser_content_view.cc",
       "views/device_chooser_content_view.h",
@@ -1080,76 +1010,11 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
       "views/elevation_icon_setter.cc",
       "views/elevation_icon_setter.h",
       "views/exclusive_access_bubble_views.cc",
-diff --git a/chrome/browser/ui/cocoa/download/download_item_controller.mm b/chrome/browser/ui/cocoa/download/download_item_controller.mm
--- a/chrome/browser/ui/cocoa/download/download_item_controller.mm
-+++ b/chrome/browser/ui/cocoa/download/download_item_controller.mm
-@@ -15,7 +15,6 @@
- #include "chrome/browser/download/download_item_model.h"
- #include "chrome/browser/download/download_shelf_context_menu.h"
- #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/safe_browsing/download_protection/download_feedback_service.h"
- #import "chrome/browser/themes/theme_properties.h"
- #import "chrome/browser/themes/theme_service.h"
- #import "chrome/browser/ui/cocoa/download/download_item_button.h"
-@@ -358,21 +357,14 @@ class DownloadShelfContextMenuMac : public DownloadShelfContextMenu {
-                            base::Time::Now() - creationTime_);
- 
-   DownloadItem* download = bridge_->download_model()->download();
-  if (![self submitDownloadToFeedbackService:download
-                                 withCommand:DownloadCommands::Command::KEEP]) {
-    // This will change the state and notify us.
-    download->ValidateDangerousDownload();
-  }
-+  download->ValidateDangerousDownload();
- }
- 
- - (IBAction)discardDownload:(id)sender {
-   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
-                            base::Time::Now() - creationTime_);
-   DownloadItem* download = bridge_->download_model()->download();
-  if (!
-      [self submitDownloadToFeedbackService:download
-                                withCommand:DownloadCommands::Command::DISCARD])
-    download->Remove();
-+  download->Remove();
-   // WARNING: we are deleted at this point.  Don't access 'this'.
- }
- 
-@@ -382,29 +374,4 @@ class DownloadShelfContextMenuMac : public DownloadShelfContextMenu {
-   [static_cast<DownloadItemButton*>(progressView_) showContextMenu];
- }
- 
-- (bool)submitDownloadToFeedbackService:(download::DownloadItem*)download
-                            withCommand:(DownloadCommands::Command)command {
-  safe_browsing::SafeBrowsingService* sb_service =
-      g_browser_process->safe_browsing_service();
-  if (!sb_service)
-    return false;
-
-  safe_browsing::DownloadProtectionService* download_protection_service =
-      sb_service->download_protection_service();
-  if (!download_protection_service)
-    return false;
-
-  DownloadItemModel* download_item_model = bridge_->download_model();
-  const Profile* profile = Profile::FromBrowserContext(
-      content::DownloadItemUtils::GetBrowserContext(download));
-  const PrefService* prefs = profile->GetPrefs();
-  if (!download_item_model->ShouldAllowDownloadFeedback() ||
-      profile->IsOffTheRecord() ||
-      !safe_browsing::IsExtendedReportingEnabled(*prefs))
-    return false;
-  download_protection_service->feedback_service()->BeginFeedbackForDownload(
-      download, command);
-  return true;
-}
-
- @end
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -242,8 +242,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
-   PreviewsInfoBarTabHelper::CreateForWebContents(web_contents);
+@@ -243,8 +243,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+   PreviewsUITabHelper::CreateForWebContents(web_contents);
   RecentlyAudibleHelper::CreateForWebContents(web_contents);
   ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents);
 -  safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents(
@@ -1157,7 +1022,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
   SearchEngineTabHelper::CreateForWebContents(web_contents);
   SecurityStateTabHelper::CreateForWebContents(web_contents);
   if (SiteEngagementService::IsEnabled())
-@@ -293,9 +291,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -298,9 +296,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
                         new ChromePDFWebContentsHelperClient()));
   PluginObserver::CreateForWebContents(web_contents);
   SadTabHelper::CreateForWebContents(web_contents);
@@ -1167,24 +1032,10 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
   SearchTabHelper::CreateForWebContents(web_contents);
   TabDialogs::CreateForWebContents(web_contents);
   ThumbnailTabHelper::CreateForWebContents(web_contents);
-diff --git a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
--- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
-+++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
-@@ -60,9 +60,7 @@ PasswordReuseModalWarningDialog::PasswordReuseModalWarningDialog(
-   SetLayoutManager(std::make_unique<views::FillLayout>());
- 
-   views::Label* message_body_label = new views::Label(
-      service_
-          ? service_->GetWarningDetailText(password_type)
-          : l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS));
-+      l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS));
-   message_body_label->SetMultiLine(true);
-   message_body_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-   message_body_label->SetHandlesTooltips(false);
 diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
 +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-@@ -251,110 +251,6 @@ BadClockBlockingPage* CreateBadClockBlockingPage(
+@@ -251,115 +251,6 @@ BadClockBlockingPage* CreateBadClockBlockingPage(
       base::Callback<void(content::CertificateRequestResultType)>());
 }
 
@@ -1208,15 +1059,18 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
 -  if (net::GetValueForKeyInQuery(web_contents->GetURL(),
 -                                 "type",
 -                                 &type_param)) {
-    // TODO(mattm): add param for SB_THREAT_TYPE_URL_UNWANTED.
 -    if (type_param == "malware") {
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
 -    } else if (type_param == "phishing") {
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_PHISHING;
+-    } else if (type_param == "unwanted") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_URL_UNWANTED;
 -    } else if (type_param == "clientside_malware") {
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE;
 -    } else if (type_param == "clientside_phishing") {
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING;
+-    } else if (type_param == "billing") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_BILLING;
 -    }
 -  }
 -  safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
@@ -1262,6 +1116,8 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
 -    } else if (type_param == "phishing") {
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_PHISHING;
+-    } else if (type_param == "unwanted") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_URL_UNWANTED;
 -    } else if (type_param == "giant") {
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
 -      is_giant_webview = true;
@@ -1295,7 +1151,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
 CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage(
     content::WebContents* web_contents) {
-@@ -458,8 +354,6 @@ void InterstitialHTMLSource::StartDataRequest(
+@@ -464,8 +355,6 @@ void InterstitialHTMLSource::StartDataRequest(
         CreateSSLBlockingPage(web_contents, true /* is superfish */));
   } else if (path_without_query == "/mitm-software-ssl") {
     interstitial_delegate.reset(CreateMITMSoftwareBlockingPage(web_contents));
@@ -1304,7 +1160,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
   } else if (path_without_query == "/clock") {
     interstitial_delegate.reset(CreateBadClockBlockingPage(web_contents));
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
-@@ -470,11 +364,6 @@ void InterstitialHTMLSource::StartDataRequest(
+@@ -476,11 +365,6 @@ void InterstitialHTMLSource::StartDataRequest(
 
   if (path_without_query == "/supervised_user") {
     html = GetSupervisedUserInterstitialHTML(path);
@@ -1422,80 +1278,21 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
 #include "components/network_hints/renderer/prescient_networking_dispatcher.h"
 #include "components/pdf/renderer/pepper_pdf_host.h"
 -#include "components/safe_browsing/renderer/threat_dom_details.h"
- #include "components/safe_browsing/renderer/websocket_sb_handshake_throttle.h"
 #include "components/services/heap_profiling/public/cpp/allocator_shim.h"
 #include "components/spellcheck/spellcheck_buildflags.h"
-@@ -1383,11 +1382,7 @@ void ChromeContentRendererClient::InitSpellCheck() {
- // default (https://crbug.com/825740).
- std::unique_ptr<blink::WebSocketHandshakeThrottle>
- ChromeContentRendererClient::CreateWebSocketHandshakeThrottle() {
-  InitSafeBrowsingIfNecessary();
-  // This is called only for Shared Worker and Service Worker that don't have a
-  // real frame, so we specify MSG_ROUTING_NONE here.
-  return std::make_unique<safe_browsing::WebSocketSBHandshakeThrottle>(
-      safe_browsing_.get(), MSG_ROUTING_NONE);
-+  return std::unique_ptr<blink::WebSocketHandshakeThrottle>(nullptr);
- }
- 
- std::unique_ptr<content::WebSocketHandshakeThrottleProvider>
-@@ -1678,15 +1673,6 @@ ChromeContentRendererClient::GetTaskSchedulerInitParams() {
-   return task_scheduler_util::GetTaskSchedulerInitParamsForRenderer();
- }
- 
-// TODO(nhiroki): Remove this once the off-main-thread WebSocket is enabled by
-// default (https://crbug.com/825740).
-void ChromeContentRendererClient::InitSafeBrowsingIfNecessary() {
-  if (safe_browsing_)
-    return;
-  RenderThread::Get()->GetConnector()->BindInterface(
-      content::mojom::kBrowserServiceName, &safe_browsing_);
-}
-
- bool ChromeContentRendererClient::OverrideLegacySymantecCertConsoleMessage(
-     const GURL& url,
-     std::string* console_message) {
-diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
--- a/chrome/renderer/chrome_content_renderer_client.h
-+++ b/chrome/renderer/chrome_content_renderer_client.h
-@@ -20,7 +20,6 @@
- #include "chrome/renderer/media/chrome_key_systems_provider.h"
- #include "components/nacl/common/buildflags.h"
- #include "components/rappor/public/interfaces/rappor_recorder.mojom.h"
-#include "components/safe_browsing/common/safe_browsing.mojom.h"
- #include "components/spellcheck/spellcheck_buildflags.h"
- #include "content/public/renderer/content_renderer_client.h"
- #include "content/public/renderer/render_thread.h"
-@@ -274,9 +273,6 @@ class ChromeContentRendererClient
-   void GetInterface(const std::string& name,
-                     mojo::ScopedMessagePipeHandle request_handle) override;
- 
-  // Initialises |safe_browsing_| if it is not already initialised.
-  void InitSafeBrowsingIfNecessary();
-
-   void PrepareErrorPageInternal(content::RenderFrame* render_frame,
-                                 const blink::WebURLRequest& failed_request,
-                                 const error_page::Error& error,
-@@ -316,8 +312,6 @@ class ChromeContentRendererClient
- 
-   ChromeKeySystemsProvider key_systems_provider_;
- 
-  safe_browsing::mojom::SafeBrowsingPtr safe_browsing_;
-
- #if BUILDFLAG(ENABLE_SPELLCHECK)
-   std::unique_ptr<SpellCheck> spellcheck_;
- #endif
+ #include "components/startup_metric_utils/common/startup_metric.mojom.h"
 diff --git a/components/safe_browsing/features.cc b/components/safe_browsing/features.cc
 --- a/components/safe_browsing/features.cc
 +++ b/components/safe_browsing/features.cc
-@@ -36,7 +36,7 @@ const base::Feature kThreatDomDetailsTagAndAttributeFeature{
-     "ThreatDomDetailsTagAttributes", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -49,7 +49,7 @@ const base::Feature kInspectDownloadedRarFiles{
+     "InspectDownloadedRarFiles", base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kSuspiciousSiteTriggerQuotaFeature{
 -    "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_ENABLED_BY_DEFAULT};
 +    "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_DISABLED_BY_DEFAULT};
 
- const base::Feature kTriggerThrottlerDailyQuotaFeature{
-     "SafeBrowsingTriggerThrottlerDailyQuota",
+ const base::Feature kThreatDomDetailsTagAndAttributeFeature{
+     "ThreatDomDetailsTagAttributes", base::FEATURE_DISABLED_BY_DEFAULT};
 -- 
 2.11.0

@@ -1,18 +1,19 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Tue, 18 Sep 2018 08:06:14 +0200
-Subject: Fixes for building without safebrowsing on Android
+Subject: Allow building without safebrowsing for Android

 ---
 .../android/java/res/xml/privacy_preferences.xml   | 12 -----
 .../preferences/privacy/PrivacyPreferences.java    | 58 ----------------------
 .../chrome_browsing_data_remover_delegate.cc       | 10 ----
+ chrome/browser/chrome_content_browser_client.cc    | 14 +-----
 .../chrome_resource_dispatcher_host_delegate.cc    |  2 +
- 4 files changed, 2 insertions(+), 80 deletions(-)
+ 5 files changed, 3 insertions(+), 93 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
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -25,18 +25,6 @@
+@@ -28,18 +28,6 @@
         android:summary="@string/always_incognito_summary"
         android:defaultValue="false" />
     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
@@ -34,7 +35,7 @@ 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
-@@ -39,12 +39,7 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -40,12 +40,7 @@ public class PrivacyPreferences extends PreferenceFragment
         implements OnPreferenceChangeListener {
     private static final String PREF_NAVIGATION_ERROR = "navigation_error";
     private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
@@ -47,7 +48,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
     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 = "network_predictions";
-@@ -77,10 +72,6 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -80,10 +75,6 @@ public class PrivacyPreferences extends PreferenceFragment
             // Remove preferences that were migrated to SyncAndServicesPreferences.
             preferenceScreen.removePreference(findPreference(PREF_NAVIGATION_ERROR));
             preferenceScreen.removePreference(findPreference(PREF_SEARCH_SUGGESTIONS));
@@ -58,7 +59,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
             preferenceScreen.removePreference(findPreference(PREF_NETWORK_PREDICTIONS));
             preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
             preferenceScreen.removePreference(findPreference(PREF_USAGE_AND_CRASH_REPORTING));
-@@ -122,32 +113,11 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -127,32 +118,11 @@ public class PrivacyPreferences extends PreferenceFragment
             preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
         }
 
@@ -91,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
         ChromeBaseCheckBoxPreference closeTabsOnExitPref =
                 (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
         closeTabsOnExitPref.setOnPreferenceChangeListener(this);
-@@ -161,12 +131,6 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -166,12 +136,6 @@ public class PrivacyPreferences extends PreferenceFragment
         String key = preference.getKey();
         if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
             PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
@@ -104,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
         } else if (PREF_ALLOW_CUSTOM_TAB_INTENTS.equals(key)) {
             SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
             sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
-@@ -225,21 +189,6 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -230,21 +194,6 @@ public class PrivacyPreferences extends PreferenceFragment
             searchSuggestionsPref.setChecked(prefServiceBridge.isSearchSuggestEnabled());
         }
 
@@ -126,7 +127,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) {
-@@ -276,13 +225,6 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -281,13 +230,6 @@ public class PrivacyPreferences extends PreferenceFragment
             if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
                 return prefs.isSearchSuggestManaged();
             }
@@ -160,10 +161,32 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
 }  // namespace
 
 ChromeBrowsingDataRemoverDelegate::ChromeBrowsingDataRemoverDelegate(
+diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
+--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
+@@ -4790,17 +4790,5 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
+     content::ResourceContext* resource_context) {
+   DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ 
+-  ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
+-  if (!io_data->safe_browsing_enabled()->GetValue())
+-    return nullptr;
+-
+-  // |safe_browsing_service_| may be unavailable in tests.
+-  if (safe_browsing_service_ && !safe_browsing_url_checker_delegate_) {
+-    safe_browsing_url_checker_delegate_ =
+-        base::MakeRefCounted<safe_browsing::UrlCheckerDelegateImpl>(
+-            safe_browsing_service_->database_manager(),
+-            safe_browsing_service_->ui_manager());
+-  }
+-
+-  return safe_browsing_url_checker_delegate_.get();
+  return nullptr;
+ }
 diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
 --- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
 +++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
-@@ -495,8 +495,10 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(
+@@ -466,8 +466,10 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(
   // of the list, so one of them gets to decide if the resource is safe.
   content::ResourceThrottle* first_throttle = NULL;
 #if defined(OS_ANDROID)
@@ -1,803 +0,0 @@
-From: thermatk <thermatk@thermatk.com>
-Date: Fri, 22 Jun 2018 17:11:38 +0200
-Subject: kill GCM
-
---
- build/secondary/third_party/android_tools/BUILD.gn |  2 -
- .../third_party/android_tools/support/BUILD.gn     |  5 --
- chrome/android/BUILD.gn                            |  1 -
- chrome/android/java/AndroidManifest.xml            | 62 ----------------------
- .../chrome/browser/BackgroundSyncLauncher.java     | 16 +++---
- .../invalidation/InvalidationController.java       | 13 +----
- .../browser/ntp/snippets/SnippetsLauncher.java     | 44 ---------------
- .../browser/services/gcm/GCMBackgroundTask.java    |  2 -
- .../gcm/InvalidationGcmUpstreamSender.java         |  3 +-
- chrome/android/java_sources.gni                    |  2 -
- components/background_task_scheduler/BUILD.gn      |  1 -
- .../BackgroundTaskSchedulerGcmNetworkManager.java  | 30 ++++-------
- components/gcm_driver/android/BUILD.gn             |  1 -
- components/gcm_driver/instance_id/android/BUILD.gn |  1 -
- .../gcm_driver/instance_id/InstanceIDBridge.java   | 29 +++-------
- components/sync/android/BUILD.gn                   |  1 -
- third_party/cacheinvalidation/BUILD.gn             |  6 ---
- .../client/contrib/MultiplexingGcmListener.java    | 49 ++---------------
- .../android2/channel/AndroidNetworkChannel.java    | 18 +++----
- 19 files changed, 36 insertions(+), 250 deletions(-)
-
-diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
--- a/build/secondary/third_party/android_tools/BUILD.gn
-+++ b/build/secondary/third_party/android_tools/BUILD.gn
-@@ -64,8 +64,6 @@ if (enable_java_templates) {
-   support_lib_alias("android_support_chromium_java") {
-     testonly = true
-   }
-  support_lib_alias("android_gcm_java") {
-  }
-   support_lib_alias("emma_device_java") {
-   }
-   prebuilt_wrapper("android_arch_lifecycle_common_java") {
-diff --git a/build/secondary/third_party/android_tools/support/BUILD.gn b/build/secondary/third_party/android_tools/support/BUILD.gn
--- a/build/secondary/third_party/android_tools/support/BUILD.gn
-+++ b/build/secondary/third_party/android_tools/support/BUILD.gn
-@@ -21,11 +21,6 @@ android_library("android_support_chromium_java") {
-   visibility += [ "//third_party/android_tools:*" ]
- }
- 
-android_java_prebuilt("android_gcm_java") {
-  jar_path = "//third_party/android_tools/sdk/extras/google/gcm/gcm-client/dist/gcm.jar"
-  visibility += [ "//third_party/android_tools:*" ]
-}
-
- android_java_prebuilt("emma_device_java") {
-   jar_path = "//third_party/android_tools/sdk/tools/lib/emma_device.jar"
-   include_java_resources = true
-diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
-+++ b/chrome/android/BUILD.gn
-@@ -269,7 +269,6 @@ android_library("chrome_java") {
-     "//third_party/android_swipe_refresh:android_swipe_refresh_java",
-     "//third_party/android_tools:android_arch_lifecycle_common_java",
-     "//third_party/android_tools:android_arch_lifecycle_runtime_java",
-    "//third_party/android_tools:android_gcm_java",
-     "//third_party/android_tools:android_support_annotations_java",
-     "//third_party/android_tools:android_support_compat_java",
-     "//third_party/android_tools:android_support_design_java",
-diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
-+++ b/chrome/android/java/AndroidManifest.xml
-@@ -77,22 +77,17 @@ by a child template that "extends" this file.
-     <permission android:name="{{ manifest_package }}.permission.CHILD_SERVICE" android:protectionLevel="signature" />
-     <permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKMARK_FOLDERS" android:protectionLevel="signatureOrSystem" />
-     <permission android:name="{{ manifest_package }}.TOS_ACKED" android:protectionLevel="signatureOrSystem" />
-    <!-- Only chrome can receive the messages and registration result -->
-    <permission android:name="{{ manifest_package }}.permission.C2D_MESSAGE"
-        android:protectionLevel="signature" />
-     <permission android:name="{{ manifest_package }}.permission.DEBUG"
-                 android:label="Debug web pages"
-                 android:permissionGroup="android.permission-group.DEVELOPMENT_TOOLS"
-                 android:protectionLevel="signature" />
- 
-    <uses-permission android:name="{{ manifest_package }}.permission.C2D_MESSAGE" />
-     <uses-permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKMARK_FOLDERS" />
-     <uses-permission android:name="{{ manifest_package }}.TOS_ACKED" />
- 
-     <uses-permission android:name="com.chrome.permission.DEVICE_EXTRAS" />
-     <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>
-     <uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/>
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
- 
-     <uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
-@@ -919,43 +914,6 @@ by a child template that "extends" this file.
-             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
-             android:hardwareAccelerated="false" />
- 
-        <!-- Receiver for GCM messages. -->
-        <receiver android:name="com.google.android.gms.gcm.GcmReceiver"
-            android:exported="true"
-            android:permission="com.google.android.c2dm.permission.SEND">
-            <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-                <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
-               <category android:name="{{ manifest_package }}"/>
-            </intent-filter>
-        </receiver>
-        <!-- GcmTaskService for registration for Invalidations. -->
-        <service android:name="com.google.ipc.invalidation.ticl.android2.channel.GcmRegistrationTaskService"
-            android:exported="true"
-            android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE" >
-            <intent-filter>
-                <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY"/>
-            </intent-filter>
-        </service>
-        <!-- InstanceIDListenerService for token refresh events from GCM. -->
-        <service android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidInstanceIDListenerService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.android.gms.iid.InstanceID"/>
-            </intent-filter>
-        </service>
-        <!-- GcmListenerService for messages from GCM. -->
-        <service android:name="org.chromium.chrome.browser.services.gcm.ChromeGcmListenerService"
-            android:exported="false" >
-            <intent-filter>
-              <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-            </intent-filter>
-        </service>
-        <meta-data android:name="ipc.invalidation.ticl.gcm_upstream_service_class"
-            android:value="org.chromium.chrome.browser.services.gcm.InvalidationGcmUpstreamSender" />
-        <service android:name="org.chromium.chrome.browser.services.gcm.InvalidationGcmUpstreamSender"
-            android:exported="false"/>
-
-         <!-- Notification service for sync. -->
-         <meta-data android:name="ipc.invalidation.ticl.listener_service_class"
-             android:value="org.chromium.chrome.browser.invalidation.ChromeInvalidationClientService"/>
-@@ -967,8 +925,6 @@ by a child template that "extends" this file.
-         </service>
-         <service android:name="com.google.ipc.invalidation.ticl.android2.TiclService"
-             android:exported="false"/>
-        <service android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageSenderService"
-            android:exported="false"/>
-         <receiver android:name="com.google.ipc.invalidation.ticl.android2.AndroidInternalScheduler$AlarmReceiver"
-             android:exported="false"/>
-         <receiver android:name="com.google.ipc.invalidation.external.client.contrib.AndroidListener$AlarmReceiver"
-@@ -995,24 +951,6 @@ by a child template that "extends" this file.
-             android:exported="false"
-             android:permission="android.permission.BIND_JOB_SERVICE"/>
- 
-        <!-- Background Task Scheduler GCM task service -->
-        <service android:name="org.chromium.components.background_task_scheduler.BackgroundTaskGcmTaskService"
-            android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY" />
-            </intent-filter>
-        </service>
-
-        <!-- GcmTaskService implementation to wake Chrome on scheduled events -->
-        <service android:name="org.chromium.chrome.browser.ChromeBackgroundService"
-            android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY" />
-            </intent-filter>
-        </service>
-
-         <service android:name="org.chromium.chrome.browser.prerender.ChromePrerenderService"
-             android:exported="true"
-             tools:ignore="ExportedService" />
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java
-@@ -8,10 +8,6 @@ import android.content.Context;
- import android.content.SharedPreferences;
- import android.os.StrictMode;
- 
-import com.google.android.gms.gcm.GcmNetworkManager;
-import com.google.android.gms.gcm.OneoffTask;
-import com.google.android.gms.gcm.Task;
-
- import org.chromium.base.AsyncTask;
- import org.chromium.base.ContextUtils;
- import org.chromium.base.Log;
-@@ -37,8 +33,6 @@ public class BackgroundSyncLauncher {
-     // BackgroundSyncLauncherAndroid, if any. If it is non-null then the browser is running.
-     private static BackgroundSyncLauncher sInstance;
- 
-    private GcmNetworkManager mScheduler;
-
-     /**
-      * Disables the automatic use of the GCMNetworkManager. When disabled, the methods which
-      * interact with GCM can still be used, but will not be called automatically on creation, or by
-@@ -123,6 +117,7 @@ public class BackgroundSyncLauncher {
-     @VisibleForTesting
-     @CalledByNative
-     protected void launchBrowserIfStopped(final boolean shouldLaunch, final long minDelayMs) {
-+    /*
-         mLaunchBrowserIfStoppedTask = new AsyncTask<Void, Void, Void>() {
-             @Override
-             protected Void doInBackground(Void... params) {
-@@ -147,6 +142,7 @@ public class BackgroundSyncLauncher {
-                 }
-             }
-         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-+        */
-     }
- 
-     /**
-@@ -158,7 +154,6 @@ public class BackgroundSyncLauncher {
-     }
- 
-     protected BackgroundSyncLauncher() {
-        mScheduler = GcmNetworkManager.getInstance(ContextUtils.getApplicationContext());
-         launchBrowserIfStopped(false, 0);
-     }
- 
-@@ -186,7 +181,7 @@ public class BackgroundSyncLauncher {
-         }
-         return !sGCMEnabled;
-     }
-
-+	/*
-     private static boolean scheduleLaunchTask(GcmNetworkManager scheduler, long minDelayMs) {
-         // Google Play Services may not be up to date, if the application was not installed through
-         // the Play Store. In this case, scheduling the task will fail silently.
-@@ -229,7 +224,7 @@ public class BackgroundSyncLauncher {
-         }
-         return true;
-     }
-
-+	*/
-     /**
-      * Reschedule any required background sync tasks, if they have been removed due to an
-      * application upgrade.
-@@ -239,6 +234,7 @@ public class BackgroundSyncLauncher {
-      * This method is static so that it can be run without actually instantiating a
-      * BackgroundSyncLauncher.
-      */
-+     /*
-     protected static void rescheduleTasksOnUpgrade(final Context context) {
-         final GcmNetworkManager scheduler = GcmNetworkManager.getInstance(context);
-         BackgroundSyncLauncher.ShouldLaunchCallback callback = shouldLaunch -> {
-@@ -252,7 +248,7 @@ public class BackgroundSyncLauncher {
-         };
-         BackgroundSyncLauncher.shouldLaunchBrowserIfStopped(callback);
-     }
-
-+	*/
-     @VisibleForTesting
-     static void setGCMEnabled(boolean enabled) {
-         sGCMEnabled = enabled;
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
-@@ -11,8 +11,6 @@ import android.os.Build;
- import android.os.Handler;
- import android.os.SystemClock;
- 
-import com.google.ipc.invalidation.ticl.android2.channel.AndroidGcmController;
-
- import org.chromium.base.ApplicationState;
- import org.chromium.base.ApplicationStatus;
- import org.chromium.base.AsyncTask;
-@@ -200,16 +198,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
-      * Registers for Google Cloud Messaging (GCM) for Invalidations.
-      */
-     private void ensureGcmIsInitialized() {
-        if (mGcmInitialized) return;
-        mGcmInitialized = true;
-        new AsyncTask<Void, Void, Void>() {
-            @Override
-            protected Void doInBackground(Void... arg0) {
-                boolean useGcmUpstream = true;
-                AndroidGcmController.get(mContext).initializeGcm(useGcmUpstream);
-                return null;
-            }
-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-+        mGcmInitialized = false;
-     }
- 
-     @VisibleForTesting
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java
-@@ -7,15 +7,10 @@ package org.chromium.chrome.browser.ntp.snippets;
- import android.content.Context;
- import android.net.ConnectivityManager;
- 
-import com.google.android.gms.gcm.GcmNetworkManager;
-import com.google.android.gms.gcm.PeriodicTask;
-import com.google.android.gms.gcm.Task;
-
- import org.chromium.base.ContextUtils;
- import org.chromium.base.Log;
- import org.chromium.base.VisibleForTesting;
- import org.chromium.base.annotations.CalledByNative;
-import org.chromium.chrome.browser.ChromeBackgroundService;
- import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
- 
- /**
-@@ -40,8 +35,6 @@ public class SnippetsLauncher {
-     // If it is non-null then the browser is running.
-     private static SnippetsLauncher sInstance;
- 
-    private GcmNetworkManager mScheduler;
-
-     private boolean mGCMEnabled = true;
- 
-     /**
-@@ -78,7 +71,6 @@ public class SnippetsLauncher {
- 
-     protected SnippetsLauncher() {
-         checkGCM();
-        mScheduler = GcmNetworkManager.getInstance(ContextUtils.getApplicationContext());
-     }
- 
-     private void checkGCM() {
-@@ -89,32 +81,7 @@ public class SnippetsLauncher {
-         }
-     }
- 
-    private static PeriodicTask buildFetchTask(
-            String tag, long periodSeconds, int requiredNetwork) {
-        // Add a bit of "flex" around the target period. This achieves the following:
-        // - It makes sure the task doesn't run (significantly) before its initial period has
-        //   elapsed. In practice, the scheduler seems to behave like that anyway, but it doesn't
-        //   guarantee that, so we shouldn't rely on it.
-        // - It gives the scheduler a bit of room to optimize for battery life.
-        long effectivePeriodSeconds = (long) (periodSeconds * (1.0 + FLEX_FACTOR));
-        long flexSeconds = (long) (periodSeconds * (2.0 * FLEX_FACTOR));
-        return new PeriodicTask.Builder()
-                .setService(ChromeBackgroundService.class)
-                .setTag(tag)
-                .setPeriod(effectivePeriodSeconds)
-                .setFlex(flexSeconds)
-                .setRequiredNetwork(requiredNetwork)
-                .setPersisted(true)
-                .setUpdateCurrent(true)
-                .build();
-    }
-
-     private void scheduleOrCancelFetchTask(String taskTag, long period, int requiredNetwork) {
-        if (period > 0) {
-            mScheduler.schedule(buildFetchTask(taskTag, period, requiredNetwork));
-        } else {
-            mScheduler.cancelTask(taskTag, ChromeBackgroundService.class);
-        }
-     }
- 
-     @CalledByNative
-@@ -127,23 +94,12 @@ public class SnippetsLauncher {
-                 .edit()
-                 .putBoolean(PREF_IS_SCHEDULED, isScheduled)
-                 .apply();
-
-        // Google Play Services may not be up to date, if the application was not installed through
-        // the Play Store. In this case, scheduling the task will fail silently.
-        try {
-            scheduleOrCancelFetchTask(
-                    TASK_TAG_WIFI, periodWifiSeconds, Task.NETWORK_STATE_UNMETERED);
-            scheduleOrCancelFetchTask(
-                    TASK_TAG_FALLBACK, periodFallbackSeconds, Task.NETWORK_STATE_CONNECTED);
-        } catch (IllegalArgumentException e) {
-             // Disable GCM for the remainder of this session.
-             mGCMEnabled = false;
- 
-             ContextUtils.getAppSharedPreferences().edit().remove(PREF_IS_SCHEDULED).apply();
-             // Return false so that the failure will be logged.
-             return false;
-        }
-        return true;
-     }
- 
-     @CalledByNative
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java
-@@ -39,8 +39,6 @@ public class GCMBackgroundTask implements BackgroundTask {
-             Log.e(TAG, "The received bundle containing message data could not be validated.");
-             return false;
-         }
-
-        ChromeGcmListenerService.dispatchMessageToDriver(context, new GCMMessage(extras));
-         return false;
-     }
- 
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java
-@@ -12,7 +12,6 @@ import android.os.Parcel;
- import android.support.annotation.MainThread;
- import android.util.Log;
- 
-import com.google.android.gms.gcm.GoogleCloudMessaging;
- import com.google.ipc.invalidation.ticl.android2.channel.GcmUpstreamSenderService;
- 
- import org.chromium.base.AsyncTask;
-@@ -95,6 +94,7 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService {
-      * This function runs on a thread from the AsyncTask.THREAD_POOL_EXECUTOR.
-      */
-     private void sendUpstreamMessage(String to, Bundle data, String token, Context context) {
-+    	/*
-         // Add the OAuth2 token to the bundle. The token should have the prefix Bearer added to it.
-         data.putString("Authorization", "Bearer " + token);
-         if (!isMessageWithinLimit(data)) {
-@@ -109,6 +109,7 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService {
-             Log.w(TAG, "Send message failed");
-             GcmUma.recordGcmUpstreamHistogram(context, GcmUma.UMA_UPSTREAM_SEND_FAILED);
-         }
-+        */
-     }
- 
-     private boolean isMessageWithinLimit(Bundle data) {
-diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
--- a/chrome/android/java_sources.gni
-+++ b/chrome/android/java_sources.gni
-@@ -27,7 +27,6 @@ chrome_java_sources = [
-   "java/src/org/chromium/chrome/browser/ChromeActivity.java",
-   "java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java",
-   "java/src/org/chromium/chrome/browser/ChromeApplication.java",
-  "java/src/org/chromium/chrome/browser/ChromeBackgroundService.java",
-   "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
-   "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
-   "java/src/org/chromium/chrome/browser/ChromeFeatureList.java",
-@@ -1217,7 +1216,6 @@ chrome_java_sources = [
-   "java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java",
-   "java/src/org/chromium/chrome/browser/services/AndroidEduOwnerCheckCallback.java",
-   "java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java",
-  "java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java",
-   "java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java",
-   "java/src/org/chromium/chrome/browser/services/gcm/GcmUma.java",
-   "java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java",
-diff --git a/components/background_task_scheduler/BUILD.gn b/components/background_task_scheduler/BUILD.gn
--- a/components/background_task_scheduler/BUILD.gn
-+++ b/components/background_task_scheduler/BUILD.gn
-@@ -23,7 +23,6 @@ if (is_android) {
-   android_library("background_task_scheduler_java") {
-     java_files = [
-       "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTask.java",
-      "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskGcmTaskService.java",
-       "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskJobService.java",
-       "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskReflection.java",
-       "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskScheduler.java",
-diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java
--- a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java
-+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java
-@@ -8,14 +8,6 @@ import android.content.Context;
- import android.os.Bundle;
- import android.support.annotation.NonNull;
- 
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.gcm.GcmNetworkManager;
-import com.google.android.gms.gcm.OneoffTask;
-import com.google.android.gms.gcm.PeriodicTask;
-import com.google.android.gms.gcm.Task;
-import com.google.android.gms.gcm.TaskParams;
-
- import org.chromium.base.Log;
- import org.chromium.base.ThreadUtils;
- import org.chromium.base.VisibleForTesting;
-@@ -33,7 +25,7 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
-     static final String BACKGROUND_TASK_CLASS_KEY = "_background_task_class";
-     @VisibleForTesting
-     static final String BACKGROUND_TASK_EXTRAS_KEY = "_background_task_extras";
-
-+    /*
-     static BackgroundTask getBackgroundTaskFromTaskParams(@NonNull TaskParams taskParams) {
-         String backgroundTaskClassName = getBackgroundTaskClassFromTaskParams(taskParams);
-         return BackgroundTaskReflection.getBackgroundTaskFromClassName(backgroundTaskClassName);
-@@ -44,7 +36,7 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
-         if (extras == null) return null;
-         return extras.getString(BACKGROUND_TASK_CLASS_KEY);
-     }
-
-+    */
-     /**
-      * Retrieves the {@link TaskParameters} from the {@link TaskParams}, which are passed as
-      * one of the keys. Only values valid for {@link android.os.BaseBundle} are supported, and other
-@@ -53,6 +45,8 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
-      * @param taskParams the {@link TaskParams} to extract the {@link TaskParameters} from.
-      * @return the {@link TaskParameters} for the current job.
-      */
-+     
-+    /*
-     static TaskParameters getTaskParametersFromTaskParams(@NonNull TaskParams taskParams) {
-         int taskId;
-         try {
-@@ -132,6 +126,7 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
-         return Task.NETWORK_STATE_ANY;
-     }
- 
-+    */
-     @Override
-     public boolean schedule(Context context, @NonNull TaskInfo taskInfo) {
-         ThreadUtils.assertOnUiThread();
-@@ -142,6 +137,7 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
-                             + " has no parameterless public constructor.");
-             return false;
-         }
-+        /*
- 
-         GcmNetworkManager gcmNetworkManager = getGcmNetworkManager(context);
-         if (gcmNetworkManager == null) {
-@@ -158,14 +154,15 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
-                     "GcmNetworkManager failed to schedule task, gcm message: " + gcmErrorMessage);
-             return false;
-         }
-
-        return true;
-+		*/
-+        return false;
-     }
- 
-     @Override
-     public void cancel(Context context, int taskId) {
-         ThreadUtils.assertOnUiThread();
- 
-+        /*
-         GcmNetworkManager gcmNetworkManager = getGcmNetworkManager(context);
-         if (gcmNetworkManager == null) {
-             Log.e(TAG, "GcmNetworkManager is not available.");
-@@ -178,14 +175,7 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
-         } catch (IllegalArgumentException e) {
-             Log.e(TAG, "GcmNetworkManager failed to cancel task.");
-         }
-    }
-
-    private GcmNetworkManager getGcmNetworkManager(Context context) {
-        if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context)
-                == ConnectionResult.SUCCESS) {
-            return GcmNetworkManager.getInstance(context);
-        }
-        return null;
-+        */
-     }
- 
-     private static String taskIdToTaskTag(int taskId) {
-diff --git a/components/gcm_driver/android/BUILD.gn b/components/gcm_driver/android/BUILD.gn
--- a/components/gcm_driver/android/BUILD.gn
-+++ b/components/gcm_driver/android/BUILD.gn
-@@ -15,7 +15,6 @@ android_library("gcm_driver_java") {
-   deps = [
-     "//base:base_java",
-     "//content/public/android:content_java",
-    "//third_party/android_tools:android_gcm_java",
-     "//third_party/jsr-305:jsr_305_javalib",
-   ]
- 
-diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm_driver/instance_id/android/BUILD.gn
--- a/components/gcm_driver/instance_id/android/BUILD.gn
-+++ b/components/gcm_driver/instance_id/android/BUILD.gn
-@@ -26,7 +26,6 @@ android_library("instance_id_driver_java") {
- 
-   java_files = [
-     "java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java",
-    "java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDWithSubtype.java",
-   ]
- }
- 
-diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
--- a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
-+++ b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
-@@ -25,7 +25,6 @@ public class InstanceIDBridge {
-      * Underlying InstanceIDWithSubtype. May be shared by multiple InstanceIDBridges. Must be
-      * initialized on a background thread.
-      */
-    private InstanceIDWithSubtype mInstanceID;
- 
-     private static boolean sBlockOnAsyncTasksForTesting;
- 
-@@ -70,7 +69,7 @@ public class InstanceIDBridge {
-         new BridgeAsyncTask<String>() {
-             @Override
-             protected String doBackgroundWork() {
-                return mInstanceID.getId();
-+                return "";
-             }
-             @Override
-             protected void sendResultToNative(String id) {
-@@ -85,7 +84,7 @@ public class InstanceIDBridge {
-         new BridgeAsyncTask<Long>() {
-             @Override
-             protected Long doBackgroundWork() {
-                return mInstanceID.getCreationTime();
-+                return 0L;
-             }
-             @Override
-             protected void sendResultToNative(Long creationTime) {
-@@ -106,11 +105,7 @@ public class InstanceIDBridge {
-         new BridgeAsyncTask<String>() {
-             @Override
-             protected String doBackgroundWork() {
-                try {
-                    return mInstanceID.getToken(authorizedEntity, scope, extras);
-                } catch (IOException ex) {
-                    return "";
-                }
-+                return "";
-             }
-             @Override
-             protected void sendResultToNative(String token) {
-@@ -126,12 +121,7 @@ public class InstanceIDBridge {
-         new BridgeAsyncTask<Boolean>() {
-             @Override
-             protected Boolean doBackgroundWork() {
-                try {
-                    mInstanceID.deleteToken(authorizedEntity, scope);
-                    return true;
-                } catch (IOException ex) {
-                    return false;
-                }
-+                return true;
-             }
-             @Override
-             protected void sendResultToNative(Boolean success) {
-@@ -146,12 +136,7 @@ public class InstanceIDBridge {
-         new BridgeAsyncTask<Boolean>() {
-             @Override
-             protected Boolean doBackgroundWork() {
-                try {
-                    mInstanceID.deleteInstanceID();
-                    return true;
-                } catch (IOException ex) {
-                    return false;
-                }
-+                return true;
-             }
-             @Override
-             protected void sendResultToNative(Boolean success) {
-@@ -190,11 +175,11 @@ public class InstanceIDBridge {
-                 @Override
-                 @SuppressWarnings("NoSynchronizedThisCheck") // Only used/accessible by native.
-                 protected Result doInBackground(Void... params) {
-                    synchronized (InstanceIDBridge.this) {
-+/*                    synchronized (InstanceIDBridge.this) {
-                         if (mInstanceID == null) {
-                             mInstanceID = InstanceIDWithSubtype.getInstance(mSubtype);
-                         }
-                    }
-+                    }*/
-                     return doBackgroundWork();
-                 }
-                 @Override
-diff --git a/components/sync/android/BUILD.gn b/components/sync/android/BUILD.gn
--- a/components/sync/android/BUILD.gn
-+++ b/components/sync/android/BUILD.gn
-@@ -10,7 +10,6 @@ android_library("sync_java") {
-     "//base:base_java",
-     "//components/signin/core/browser/android:java",
-     "//net/android:net_java",
-    "//third_party/android_tools:android_gcm_java",
-     "//third_party/android_tools:android_support_annotations_java",
-     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
-     "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
-diff --git a/third_party/cacheinvalidation/BUILD.gn b/third_party/cacheinvalidation/BUILD.gn
--- a/third_party/cacheinvalidation/BUILD.gn
-+++ b/third_party/cacheinvalidation/BUILD.gn
-@@ -141,7 +141,6 @@ if (is_android) {
-       "$google_play_services_package:google_play_services_iid_java",
-       "$google_play_services_package:google_play_services_tasks_java",
-       "//third_party/android_protobuf:protobuf_nano_javalib",
-      "//third_party/android_tools:android_gcm_java",
-     ]
- 
-     java_files = [
-@@ -207,13 +206,8 @@ if (is_android) {
-       "src/java/com/google/ipc/invalidation/ticl/android2/WakeLockManager.java",
-       "src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidChannelConstants.java",
-       "src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidChannelPreferences.java",
-      "src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidGcmController.java",
-      "src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidInstanceIDListenerService.java",
-      "src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageReceiverService.java",
-      "src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageSenderService.java",
-       "src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidNetworkChannel.java",
-       "src/java/com/google/ipc/invalidation/ticl/android2/channel/CommonUtils.java",
-      "src/java/com/google/ipc/invalidation/ticl/android2/channel/GcmRegistrationTaskService.java",
-       "src/java/com/google/ipc/invalidation/ticl/android2/channel/GcmUpstreamSenderService.java",
-       "src/java/com/google/ipc/invalidation/ticl/proto/AndroidChannel.java",
-       "src/java/com/google/ipc/invalidation/ticl/proto/AndroidListenerProtocol.java",
-diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/contrib/MultiplexingGcmListener.java b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/contrib/MultiplexingGcmListener.java
--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/contrib/MultiplexingGcmListener.java
-+++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/contrib/MultiplexingGcmListener.java
-@@ -16,9 +16,6 @@
- 
- package com.google.ipc.invalidation.external.client.contrib;
- 
-import com.google.android.gcm.GCMBaseIntentService;
-import com.google.android.gcm.GCMBroadcastReceiver;
-import com.google.android.gcm.GCMRegistrar;
- import com.google.ipc.invalidation.external.client.SystemResources.Logger;
- import com.google.ipc.invalidation.external.client.android.service.AndroidLogger;
- import com.google.ipc.invalidation.ticl.android2.WakeLockManager;
-@@ -69,7 +66,7 @@ import android.content.pm.ServiceInfo;
-  * there is nothing to do except log an error (which this class does).
-  *
-  */
-public class MultiplexingGcmListener extends GCMBaseIntentService {
-+public class MultiplexingGcmListener {
-   /* This class is public so that it can be instantiated by the Android runtime. */
- 
-   /** Constants used in broadcast Intents. */
-@@ -106,18 +103,6 @@ public class MultiplexingGcmListener extends GCMBaseIntentService {
-   }
- 
-   /**
-   * {@link GCMBroadcastReceiver} that forwards GCM intents to the {@code MultiplexingGcmListener}
-   * class.
-   */
-  public static class GCMReceiver extends GCMBroadcastReceiver {
-    /* This class is public so that it can be instantiated by the Android runtime. */
-    @Override
-    protected String getGCMIntentServiceClassName(Context context) {
-      return MultiplexingGcmListener.class.getName();
-    }
-  }
-
-  /**
-    * Convenience base class for client implementations. It provides base classes for a broadcast
-    * receiver and an intent service that work together to handle events from the
-    * {@code MultiplexingGcmListener} while holding a wake lock.
-@@ -261,7 +246,7 @@ public class MultiplexingGcmListener extends GCMBaseIntentService {
-   private static final Logger logger = AndroidLogger.forTag("MplexGcmListener");
- 
-   // All onYYY methods work by constructing an appropriate Intent and broadcasting it.
-
-+	/*
-   @Override
-   protected void onMessage(Context context, Intent intent) {
-     Intent newIntent = new Intent();
-@@ -304,35 +289,7 @@ public class MultiplexingGcmListener extends GCMBaseIntentService {
-   protected String[] getSenderIds(Context context) {
-     return readSenderIdsFromManifestOrDie(this);
-   }
-
-  /**
-   * Broadcasts {@code intent} with the action set to {@link Intents#ACTION} and the package name
-   * set to the package name of this service.
-   */
-  private void rebroadcast(Intent intent) {
-    intent.setAction(Intents.ACTION);
-    intent.setPackage(getPackageName());
-    sendBroadcast(intent);
-  }
-
-  /**
-   * Registers with GCM if not already registered. Also verifies that the device supports GCM
-   * and that the manifest is correctly configured. Returns the existing registration id, if one
-   * exists, or the empty string if one does not.
-   *
-   * @throws UnsupportedOperationException if the device does not have all GCM dependencies
-   * @throws IllegalStateException if the manifest is not correctly configured
-   */
-  public static String initializeGcm(Context context) {
-    AndroidChannelPreferences.setGcmChannelType(context, GcmChannelType.DEFAULT);
-    GCMRegistrar.checkDevice(context);
-    GCMRegistrar.checkManifest(context);
-    final String regId = GCMRegistrar.getRegistrationId(context);
-    if (regId.isEmpty()) {
-      GCMRegistrar.register(context, readSenderIdsFromManifestOrDie(context));
-    }
-    return regId;
-  }
-+	*/
- 
-   /**
-    * Returns the GCM sender ids from {@link #GCM_SENDER_IDS_METADATA_KEY} or throws a
-diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidNetworkChannel.java b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidNetworkChannel.java
--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidNetworkChannel.java
-+++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidNetworkChannel.java
-@@ -48,16 +48,12 @@ public class AndroidNetworkChannel implements TestableNetworkChannel {
-     Intent intent = ProtocolIntents.newOutboundMessageIntent(outgoingMessage);
- 
-     // Select the sender service to use for upstream message.
-    if (AndroidChannelPreferences.getGcmChannelType(context) == GcmChannelType.GCM_UPSTREAM){
-      String upstreamServiceClass = new AndroidTiclManifest(context).getGcmUpstreamServiceClass();
-      if (upstreamServiceClass == null || upstreamServiceClass.isEmpty()) {
-        logger.warning("GcmUpstreamSenderService class not found.");
-        return;
-      }
-      intent.setClassName(context, upstreamServiceClass);
-    } else {
-      intent.setClassName(context, AndroidMessageSenderService.class.getName());
-    }
-+	  String upstreamServiceClass = new AndroidTiclManifest(context).getGcmUpstreamServiceClass();
-+	  if (upstreamServiceClass == null || upstreamServiceClass.isEmpty()) {
-+		logger.warning("GcmUpstreamSenderService class not found.");
-+		return;
-+	  }
-+	  intent.setClassName(context, upstreamServiceClass);
-     try {
-       context.startService(intent);
-     } catch (IllegalStateException exception) {
-@@ -77,6 +73,6 @@ public class AndroidNetworkChannel implements TestableNetworkChannel {
- 
-   @Override
-   public NetworkEndpointId getNetworkIdForTest() {
-    return AndroidMessageSenderService.getNetworkEndpointId(context, resources.getLogger());
-+    return null;
-   }
- }
-- 
-2.11.0
-
@@ -18,7 +18,7 @@ diff --git a/components/translate/core/browser/translate_language_list.cc b/comp
   // If resource requests are not allowed, we'll get a callback when they are.
   if (!resource_requests_allowed_) {
     request_pending_ = true;
-@@ -233,6 +234,7 @@ void TranslateLanguageList::RequestLanguageList() {
+@@ -236,6 +237,7 @@ void TranslateLanguageList::RequestLanguageList() {
     if (!result)
       NotifyEvent(__LINE__, "Request is omitted due to retry limit");
   }
@@ -174,7 +174,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMen
 import org.chromium.base.AsyncTask;
 import org.chromium.base.CommandLine;
 import org.chromium.base.Log;
-@@ -162,13 +160,7 @@ public class UpdateMenuItemHelper {
+@@ -163,13 +161,7 @@ public class UpdateMenuItemHelper {
     }
 
     private static boolean isGooglePlayStoreAvailable(Context context) {
@@ -192,7 +192,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMen
 diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
 --- a/chrome/android/java_sources.gni
 +++ b/chrome/android/java_sources.gni
-@@ -586,10 +586,7 @@ chrome_java_sources = [
+@@ -618,10 +618,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/fullscreen/FullscreenManager.java",
   "java/src/org/chromium/chrome/browser/fullscreen/FullscreenOptions.java",
   "java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClient.java",
@@ -24,7 +24,7 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j
 diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
 --- a/chrome/android/java/res/values/dimens.xml
 +++ b/chrome/android/java/res/values/dimens.xml
-@@ -179,7 +179,6 @@
+@@ -180,7 +180,6 @@
     <dimen name="fre_stacked_button_margin">8dp</dimen>
     <dimen name="fre_margin">24dp</dimen>
     <dimen name="fre_image_height">120dp</dimen>
@@ -0,0 +1,25 @@
+From: xsmile <xsmile@users.noreply.github.com>
+Date: Thu, 11 Oct 2018 21:29:35 +0200
+Subject: Allow sign-in to Google sites like Gmail without signing in to
+ Chromium
+
+Disable prefs::kSigninAllowedOnNextStartup by default. The setting can be found in chrome://settings
+---
+ chrome/browser/signin/account_consistency_mode_manager.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc
+--- a/chrome/browser/signin/account_consistency_mode_manager.cc
+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
+@@ -172,7 +172,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs(
+   registry->RegisterBooleanPref(prefs::kAccountConsistencyMirrorRequired,
+                                 false);
+ #endif
+-  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, true);
+  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, false);
+ }
+ 
+ // static
+-- 
+2.11.0
+
@@ -0,0 +1,137 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 17 Oct 2018 06:06:11 +0200
+Subject: Permanently disable query-in-omnibox
+
+---
+ .../chromium/chrome/browser/ChromeFeatureList.java |  1 -
+ .../chrome/browser/toolbar/ToolbarModel.java       |  2 +-
+ chrome/browser/about_flags.cc                      |  4 ----
+ chrome/browser/android/chrome_feature_list.cc      |  1 -
+ chrome/browser/flag_descriptions.cc                |  5 ----
+ chrome/browser/flag_descriptions.h                 |  3 ---
+ components/omnibox/browser/query_in_omnibox.cc     | 27 +---------------------
+ 7 files changed, 2 insertions(+), 41 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+@@ -272,7 +272,6 @@ public abstract class ChromeFeatureList {
+     public static final String SOUND_CONTENT_SETTING = "SoundContentSetting";
+     public static final String SPANNABLE_INLINE_AUTOCOMPLETE = "SpannableInlineAutocomplete";
+     public static final String SUBRESOURCE_FILTER = "SubresourceFilter";
+-    public static final String QUERY_IN_OMNIBOX = "QueryInOmnibox";
+     public static final String TAB_REPARENTING = "TabReparenting";
+     public static final String TRUSTED_WEB_ACTIVITY = "TrustedWebActivity";
+     public static final String TRUSTED_WEB_ACTIVITY_POST_MESSAGE = "TrustedWebActivityPostMessage";
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java
+@@ -85,7 +85,7 @@ public class ToolbarModel implements ToolbarDataProvider {
+      */
+     public void initializeWithNative() {
+         mNativeToolbarModelAndroid = nativeInit();
+-        mQueryInOmniboxEnabled = ChromeFeatureList.isEnabled(ChromeFeatureList.QUERY_IN_OMNIBOX);
+        mQueryInOmniboxEnabled = false;
+     }
+ 
+     /**
+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
+@@ -3990,10 +3990,6 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(features::kOobeRecommendAppsScreen)},
+ #endif  // OS_CHROMEOS
+ 
+-    {"enable-query-in-omnibox", flag_descriptions::kQueryInOmniboxName,
+-     flag_descriptions::kQueryInOmniboxDescription, kOsAll,
+-     FEATURE_VALUE_TYPE(omnibox::kQueryInOmnibox)},
+-
+     {"enable-viz-hit-test-draw-quad",
+      flag_descriptions::kVizHitTestDrawQuadName,
+      flag_descriptions::kVizHitTestDrawQuadDescription, kOsAll,
+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
+@@ -167,7 +167,6 @@ const base::Feature* kFeaturesExposedToJava[] = {
+     &offline_pages::kOfflinePagesSharingFeature,
+     &offline_pages::kOfflinePagesLivePageSharingFeature,
+     &offline_pages::kPrefetchingOfflinePagesFeature,
+-    &omnibox::kQueryInOmnibox,
+     &omnibox::kUIExperimentHideSteadyStateUrlSchemeAndSubdomains,
+     &password_manager::features::kPasswordExport,
+     &password_manager::features::kPasswordSearchMobile,
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
+@@ -1531,11 +1531,6 @@ const char kPullToRefreshDescription[] =
+     "Pull-to-refresh gesture in response to vertical overscroll.";
+ const char kPullToRefreshEnabledTouchscreen[] = "Enabled for touchscreen only";
+ 
+-const char kQueryInOmniboxName[] = "Query in Omnibox";
+-const char kQueryInOmniboxDescription[] =
+-    "Only display query terms in the omnibox when viewing a search results "
+-    "page.";
+-
+ const char kQuicName[] = "Experimental QUIC protocol";
+ const char kQuicDescription[] = "Enable experimental QUIC protocol support.";
+ 
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
+@@ -940,9 +940,6 @@ extern const char kPullToRefreshName[];
+ extern const char kPullToRefreshDescription[];
+ extern const char kPullToRefreshEnabledTouchscreen[];
+ 
+-extern const char kQueryInOmniboxName[];
+-extern const char kQueryInOmniboxDescription[];
+-
+ extern const char kQuicName[];
+ extern const char kQuicDescription[];
+ 
+diff --git a/components/omnibox/browser/query_in_omnibox.cc b/components/omnibox/browser/query_in_omnibox.cc
+--- a/components/omnibox/browser/query_in_omnibox.cc
+++ b/components/omnibox/browser/query_in_omnibox.cc
+@@ -10,16 +10,6 @@
+ #include "components/omnibox/browser/omnibox_field_trial.h"
+ #include "components/search_engines/template_url_service.h"
+ 
+-namespace {
+-
+-bool SecurityLevelSafeForQueryInOmnibox(
+-    security_state::SecurityLevel security_level) {
+-  return security_level == security_state::SecurityLevel::SECURE ||
+-         security_level == security_state::SecurityLevel::EV_SECURE;
+-}
+-
+-}  // namespace
+-
+ QueryInOmnibox::QueryInOmnibox(AutocompleteClassifier* autocomplete_classifier,
+                                TemplateURLService* template_url_service)
+     : autocomplete_classifier_(autocomplete_classifier),
+@@ -32,22 +22,7 @@ bool QueryInOmnibox::GetDisplaySearchTerms(
+     security_state::SecurityLevel security_level,
+     const GURL& url,
+     base::string16* search_terms) {
+-  if (!base::FeatureList::IsEnabled(omnibox::kQueryInOmnibox))
+-    return false;
+-
+-  if (!ignore_security_level_ &&
+-      !SecurityLevelSafeForQueryInOmnibox(security_level)) {
+-    return false;
+-  }
+-
+-  base::string16 extracted_search_terms = ExtractSearchTermsInternal(url);
+-  if (extracted_search_terms.empty())
+-    return false;
+-
+-  if (search_terms)
+-    *search_terms = extracted_search_terms;
+-
+-  return true;
+  return false;
+ }
+ 
+ base::string16 QueryInOmnibox::ExtractSearchTermsInternal(const GURL& url) {
+-- 
+2.11.0
+
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 28 Oct 2018 14:11:50 +0100
+Subject: Offer builtin autocomplete for chrome://flags
+
+---
+ chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+@@ -228,6 +228,8 @@ std::vector<base::string16>
+ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+   std::vector<base::string16> builtins_to_provide;
+   builtins_to_provide.push_back(
+      base::ASCIIToUTF16(chrome::kChromeUIFlagsURL));
+  builtins_to_provide.push_back(
+       base::ASCIIToUTF16(chrome::kChromeUIChromeURLsURL));
+ #if !defined(OS_ANDROID)
+   builtins_to_provide.push_back(
+-- 
+2.11.0
+
@@ -0,0 +1,24 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 2 Nov 2018 14:06:17 +0100
+Subject: Enable history requirement of user gesture
+
+Set #enable-history-entry-requires-user-gesture to enabled by default
+---
+ chrome/browser/about_flags.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+@@ -1486,7 +1486,7 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-history-entry-requires-user-gesture",
+      flag_descriptions::kHistoryRequiresUserGestureName,
+      flag_descriptions::kHistoryRequiresUserGestureDescription, kOsAll,
+-     SINGLE_VALUE_TYPE(switches::kHistoryEntryRequiresUserGesture)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kHistoryEntryRequiresUserGesture)},
+     {"disable-pushstate-throttle",
+      flag_descriptions::kDisablePushStateThrottleName,
+      flag_descriptions::kDisablePushStateThrottleDescription, kOsAll,
+-- 
+2.11.0
+
@@ -0,0 +1,24 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 2 Nov 2018 14:10:32 +0100
+Subject: Enable serialization of scroll position changes while loading
+
+Set #enable-scroll-anchor-serialization to enabled by default
+---
+ content/public/common/content_features.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
+--- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc
+@@ -377,7 +377,7 @@ const base::Feature kRunVideoCaptureServiceInBrowserProcess{
+ 
+ // Save the scroll anchor and use it to restore scroll position.
+ const base::Feature kScrollAnchorSerialization{
+-    "ScrollAnchorSerialization", base::FEATURE_DISABLED_BY_DEFAULT};
+    "ScrollAnchorSerialization", base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ // Make sendBeacon throw for a Blob with a non simple type.
+ const base::Feature kSendBeaconThrowForBlobWithNonSimpleType{
+-- 
+2.11.0
+
@@ -0,0 +1,117 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 2 Nov 2018 20:01:11 +0100
+Subject: Remove passwords keyboard accessory option
+
+Completely rip out #passwords-keyboard-accessory, since the default of
+disabled does not seem to be working
+---
+ chrome/browser/about_flags.cc                                     | 5 -----
+ chrome/browser/android/chrome_feature_list.cc                     | 1 -
+ chrome/browser/flag_descriptions.cc                               | 6 ------
+ chrome/browser/flag_descriptions.h                                | 3 ---
+ chrome/browser/password_manager/password_accessory_controller.cc  | 8 +-------
+ .../password_manager/core/common/password_manager_features.cc     | 4 ----
+ .../password_manager/core/common/password_manager_features.h      | 1 -
+ 7 files changed, 1 insertion(+), 27 deletions(-)
+
+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
+@@ -2854,11 +2854,6 @@ const FeatureEntry kFeatureEntries[] = {
+     {"password-search", flag_descriptions::kPasswordSearchMobileName,
+      flag_descriptions::kPasswordSearchMobileDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(password_manager::features::kPasswordSearchMobile)},
+-    {"passwords-keyboard-accessory",
+-     flag_descriptions::kPasswordsKeyboardAccessoryName,
+-     flag_descriptions::kPasswordsKeyboardAccessoryDescription, kOsAndroid,
+-     FEATURE_VALUE_TYPE(
+-         password_manager::features::kPasswordsKeyboardAccessory)},
+ #endif  // OS_ANDROID
+ #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+     {"passwords-migrate-linux-to-login-db",
+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
+@@ -170,7 +170,6 @@ const base::Feature* kFeaturesExposedToJava[] = {
+     &omnibox::kUIExperimentHideSteadyStateUrlSchemeAndSubdomains,
+     &password_manager::features::kPasswordExport,
+     &password_manager::features::kPasswordSearchMobile,
+-    &password_manager::features::kPasswordsKeyboardAccessory,
+     &unified_consent::kUnifiedConsent,
+     &subresource_filter::kSafeBrowsingSubresourceFilter,
+ };
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
+@@ -1480,12 +1480,6 @@ const char kPasswordSearchMobileName[] = "Password search";
+ const char kPasswordSearchMobileDescription[] =
+     "Search functionality in password settings.";
+ 
+-const char kPasswordsKeyboardAccessoryName[] =
+-    "Add password-related functions to keyboard accessory";
+-const char kPasswordsKeyboardAccessoryDescription[] =
+-    "Adds password generation button and toggle for the passwords bottom sheet "
+-    "to the keyboard accessory. Replaces password generation popups.";
+-
+ const char kPasswordsMigrateLinuxToLoginDBName[] =
+     "Migrate passwords to \"Login Data\"";
+ const char kPasswordsMigrateLinuxToLoginDBDescription[] =
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
+@@ -909,9 +909,6 @@ extern const char kPasswordImportDescription[];
+ extern const char kPasswordSearchMobileName[];
+ extern const char kPasswordSearchMobileDescription[];
+ 
+-extern const char kPasswordsKeyboardAccessoryName[];
+-extern const char kPasswordsKeyboardAccessoryDescription[];
+-
+ extern const char kPasswordsMigrateLinuxToLoginDBName[];
+ extern const char kPasswordsMigrateLinuxToLoginDBDescription[];
+ 
+diff --git a/chrome/browser/password_manager/password_accessory_controller.cc b/chrome/browser/password_manager/password_accessory_controller.cc
+--- a/chrome/browser/password_manager/password_accessory_controller.cc
+++ b/chrome/browser/password_manager/password_accessory_controller.cc
+@@ -158,13 +158,7 @@ PasswordAccessoryController::~PasswordAccessoryController() = default;
+ bool PasswordAccessoryController::AllowedForWebContents(
+     content::WebContents* web_contents) {
+   DCHECK(web_contents) << "Need valid WebContents to attach controller to!";
+-  if (vr::VrTabHelper::IsInVr(web_contents)) {
+-    return false;  // TODO(crbug.com/865749): Reenable if works for VR keyboard.
+-  }
+-  // Either #passwords-keyboards-accessory or #experimental-ui must be enabled.
+-  return base::FeatureList::IsEnabled(
+-             password_manager::features::kPasswordsKeyboardAccessory) ||
+-         base::FeatureList::IsEnabled(features::kExperimentalUi);
+  return false;
+ }
+ 
+ // static
+diff --git a/components/password_manager/core/common/password_manager_features.cc b/components/password_manager/core/common/password_manager_features.cc
+--- a/components/password_manager/core/common/password_manager_features.cc
+++ b/components/password_manager/core/common/password_manager_features.cc
+@@ -68,10 +68,6 @@ const base::Feature kPasswordImport = {"PasswordImport",
+ const base::Feature kPasswordSearchMobile = {"PasswordSearchMobile",
+                                              base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+-// Adds password-related features to the keyboard accessory on mobile devices.
+-const base::Feature kPasswordsKeyboardAccessory = {
+-    "PasswordsKeyboardAccessory", base::FEATURE_DISABLED_BY_DEFAULT};
+-
+ // Enables the experiment for the password manager to only fill on account
+ // selection, rather than autofilling on page load, with highlighting of fields.
+ const base::Feature kFillOnAccountSelect = {"fill-on-account-select",
+diff --git a/components/password_manager/core/common/password_manager_features.h b/components/password_manager/core/common/password_manager_features.h
+--- a/components/password_manager/core/common/password_manager_features.h
+++ b/components/password_manager/core/common/password_manager_features.h
+@@ -32,7 +32,6 @@ extern const base::Feature kNewPasswordFormParsingForSaving;
+ extern const base::Feature kPasswordExport;
+ extern const base::Feature kPasswordImport;
+ extern const base::Feature kPasswordSearchMobile;
+-extern const base::Feature kPasswordsKeyboardAccessory;
+ extern const base::Feature kProtectSyncCredential;
+ extern const base::Feature kProtectSyncCredentialOnReauth;
+ 
+-- 
+2.11.0
+
@@ -0,0 +1,56 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 5 Nov 2018 09:39:50 +0100
+Subject: Enable TLS 1.3 (final) by default
+
+---
+ .../browser/ssl/ssl_config_service_manager_pref.cc  | 21 ++-------------------
+ 1 file changed, 2 insertions(+), 19 deletions(-)
+
+diff --git a/chrome/browser/ssl/ssl_config_service_manager_pref.cc b/chrome/browser/ssl/ssl_config_service_manager_pref.cc
+--- a/chrome/browser/ssl/ssl_config_service_manager_pref.cc
+++ b/chrome/browser/ssl/ssl_config_service_manager_pref.cc
+@@ -12,7 +12,6 @@
+ #include "base/bind.h"
+ #include "base/location.h"
+ #include "base/macros.h"
+-#include "base/metrics/field_trial_params.h"
+ #include "base/strings/string_util.h"
+ #include "base/values.h"
+ #include "chrome/common/chrome_switches.h"
+@@ -115,8 +114,6 @@ std::vector<std::string> CanonicalizeHostnamePatterns(
+   return out;
+ }
+ 
+-const char kTLS13VariantExperimentName[] = "TLS13Variant";
+-
+ ////////////////////////////////////////////////////////////////////////////////
+ //  SSLConfigServiceManagerPref
+ 
+@@ -173,22 +170,8 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
+     PrefService* local_state) {
+   DCHECK(local_state);
+ 
+-  const std::string tls13_variant =
+-      base::GetFieldTrialParamValue(kTLS13VariantExperimentName, "variant");
+-  const char* tls13_value = nullptr;
+-  const char* version_value = nullptr;
+-  if (tls13_variant == "disabled") {
+-    tls13_value = switches::kTLS13VariantDisabled;
+-  } else if (tls13_variant == "draft23") {
+-    tls13_value = switches::kTLS13VariantDraft23;
+-    version_value = switches::kSSLVersionTLSv13;
+-  } else if (tls13_variant == "draft28") {
+-    tls13_value = switches::kTLS13VariantDraft28;
+-    version_value = switches::kSSLVersionTLSv13;
+-  } else if (tls13_variant == "final") {
+-    tls13_value = switches::kTLS13VariantFinal;
+-    version_value = switches::kSSLVersionTLSv13;
+-  }
+  const char* tls13_value = switches::kTLS13VariantFinal;
+  const char* version_value = switches::kSSLVersionTLSv13;
+ 
+   if (tls13_value) {
+     local_state->SetDefaultPrefValue(prefs::kTLS13Variant,
+-- 
+2.11.0
+
Author	SHA1	Message	Date
csagan5	e1b9f9d68a	Release 70.0.3538.95	2018-11-05 22:33:05 +01:00
csagan5	7f7fc80c7a	Release 70.0.3538.87	2018-11-03 23:22:55 +01:00
csagan5	aa96e7ce43	Release 70.0.3538.83	2018-10-30 16:13:18 +01:00
csagan5	5c9d69ebcc	Mention improvement for background video playback	2018-10-27 20:18:17 +02:00
csagan5	7469dbed21	Release 70.0.3538.80	2018-10-27 20:14:19 +02:00
csagan5	bc1f0b79f5	Release 70.0.3538.77	2018-10-24 17:32:08 +02:00
csagan5	4c2225259f	More verbose lines about anti-fingerprinting mitigations	2018-10-23 08:40:27 +02:00
csagan5	2ba0013cc6	Release 70.0.3538.71	2018-10-21 17:17:21 +02:00
csagan5	b92ce6a3a2	Mention Vadim Pleshkov for the new logo; remove not-yet-fixed bug from changelog	2018-10-19 04:49:34 +02:00
csagan5	de80f36496	Release 70.0.3538.67	2018-10-17 18:22:21 +02:00