Release 67.0.3396.72

Add missing patch
Release 67.0.3396.67
2018-06-04 20:45:57 +02:00 · 2018-06-01 15:59:14 +02:00 · 2018-06-01 15:58:52 +02:00 · 2018-05-29 20:52:06 +02:00 · 2018-05-26 11:13:29 +02:00 · 2018-05-24 09:59:15 +02:00
42 changed files with 4011 additions and 655 deletions
@@ -1,3 +1,42 @@
+# 67.0.3396.72
+* add global toggle for adblock engine (https://github.com/bromite/bromite/issues/53)
+* updated AdBlock filters
+
+# 67.0.3396.67
+* updated AdBlock filters
+
+# 66.0.3359.202
+* fix DevTools integration (https://github.com/bromite/bromite/issues/23)
+* allow toggling of Javascript from New Tab Page (fixes https://github.com/bromite/bromite/issues/60)
+* updated AdBlock filters
+
+# 66.0.3359.200
+* updated AdBlock filters
+
+# 66.0.3359.196
+* updated AdBlock filters
+
+# 66.0.3359.188
+* updated AdBlock filters
+* increase max (persistent) connections per server from 6 to 15
+* preliminary work for better canvas fingerprinting mitigations
+
+# 66.0.3359.161
+* updated AdBlock filters
+
+# 66.0.3359.148
+* disable permanently all custom tab intents (https://github.com/bromite/bromite/issues/17)
+* updated AdBlock filters
+* reduce randomisation for client rects from 5% to 3%
+
+# 65.0.3325.230
+* fixed permission to access Google account issue (https://github.com/bromite/bromite/issues/11)
+* updated AdBlock filters
+
+# 65.0.3325.218
+* always set WideVine version
+* updated AdBlock filters
+
 # 65.0.3325.204
 * add menu option to toggle global Javascript preferences setting (https://github.com/bromite/bromite/issues/37)
 * add fingeprinting mitigation for getClientRects, getBoundingClientRect
@@ -5,12 +44,12 @@
 * updated AdBlock filters

 # 65.0.3325.198
-* re-landed support of third-party filters
+* re-landed support for third-party AdBlock filters
 * completed patches cleanup
 * updated AdBlock filters

 # 65.0.3325.190
-* block some Canvas and AudioBuffer APIs mostly used for fingerprinting
+* block some Canvas and AudioBuffer APIs mostly used for fingerprinting (https://github.com/bromite/bromite/issues/15)
 * updated AdBlock filters

 # 65.0.3325.176
@@ -1,6 +1,6 @@
 # Bromite - Take back your browser

-[![GitHub release][version-image]][version-url] [![license][license-image]][license-url]
+<img src="https://www.bromite.org/release.svg" alt="current Bromite release" title="current Bromite release" /> [![license][license-image]][license-url]

 <img title="Bromite - take back your browser!" src="https://www.bromite.org/android-icon-192x192.png" width="96" alt="Bromite" />

@@ -1,27 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 11 Oct 2017 22:47:49 +0200
-Subject: Disable the ad promo system by default
-
-author: Michael Gilbert <mgilbert@debian.org>
-bug-debian: http://bugs.debian.org/634101
---
- chrome/browser/ui/app_list/app_list_service.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/chrome/browser/ui/app_list/app_list_service.cc b/chrome/browser/ui/app_list/app_list_service.cc
--- a/chrome/browser/ui/app_list/app_list_service.cc
-+++ b/chrome/browser/ui/app_list/app_list_service.cc
-@@ -142,6 +142,10 @@ void AppListService::RegisterPrefs(PrefRegistrySimple* registry) {
-   registry->RegisterIntegerPref(prefs::kAppListEnableMethod,
-                                 ENABLE_NOT_RECORDED);
-   registry->RegisterInt64Pref(prefs::kAppListEnableTime, 0);
-+
-+  // Identifies whether we should show the app launcher promo or not. This
-+  // becomes false when the user dismisses the promo.
-+  registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, false);
- }
- 
- // static
-- 
-2.7.4
-
@@ -0,0 +1,32 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 18 May 2018 10:10:00 +0200
+Subject: Increase maximum connections per host from 6 to 15
+
+---
+ net/socket/client_socket_pool_manager.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
+--- a/net/socket/client_socket_pool_manager.cc
+++ b/net/socket/client_socket_pool_manager.cc
+@@ -34,7 +34,7 @@ static_assert(arraysize(g_max_sockets_per_pool) ==
+                   HttpNetworkSession::NUM_SOCKET_POOL_TYPES,
+               "max sockets per pool length mismatch");
+ 
+-// Default to allow up to 6 connections per host. Experiment and tuning may
+// Default to allow up to 15 connections per host. Experiment and tuning may
+ // try other values (greater than 0).  Too large may cause many problems, such
+ // as home routers blocking the connections!?!?  See http://crbug.com/12066.
+ //
+@@ -43,7 +43,7 @@ static_assert(arraysize(g_max_sockets_per_pool) ==
+ // be the same as the limit for ws. Also note that Firefox uses a limit of 200.
+ // See http://crbug.com/486800
+ int g_max_sockets_per_group[] = {
+-    6,   // NORMAL_SOCKET_POOL
+    15,  // NORMAL_SOCKET_POOL
+     255  // WEBSOCKET_SOCKET_POOL
+ };
+ 
+-- 
+2.7.4
+
@@ -10,7 +10,7 @@ author: Chad Miller <chad.miller@canonical.com>
 diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -88,7 +88,7 @@ void CookieSettings::GetCookieSettings(
+@@ -111,7 +111,7 @@ void CookieSettings::GetCookieSettings(
 void CookieSettings::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -21,8 +21,8 @@ diff --git a/components/component_updater/configurator_impl.cc b/components/comp
 
 // If there is an element of |vec| of the form |test|=.*, returns the right-
 // hand side of that assignment. Otherwise, returns an empty string.
-@@ -89,8 +91,7 @@ ConfiguratorImpl::ConfiguratorImpl(
-       fast_update_(false),
+@@ -86,8 +88,7 @@ ConfiguratorImpl::ConfiguratorImpl(const base::CommandLine* cmdline,
+     : fast_update_(false),
       pings_enabled_(false),
       deltas_enabled_(false),
 -      background_downloads_enabled_(false),
@@ -31,7 +31,7 @@ diff --git a/components/component_updater/configurator_impl.cc b/components/comp
   // Parse comma-delimited debug flags.
   std::vector<std::string> switch_values = base::SplitString(
       cmdline->GetSwitchValueASCII(switches::kComponentUpdater), ",",
-@@ -138,22 +139,6 @@ int ConfiguratorImpl::UpdateDelay() const {
+@@ -135,22 +136,6 @@ int ConfiguratorImpl::UpdateDelay() const {
 
 std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
   std::vector<GURL> urls;
@@ -57,7 +57,7 @@ diff --git a/components/component_updater/configurator_impl.cc b/components/comp
 diff --git a/components/component_updater/configurator_impl.h b/components/component_updater/configurator_impl.h
 --- a/components/component_updater/configurator_impl.h
 +++ b/components/component_updater/configurator_impl.h
-@@ -98,7 +98,6 @@ class ConfiguratorImpl {
+@@ -89,7 +89,6 @@ class ConfiguratorImpl {
   bool pings_enabled_;
   bool deltas_enabled_;
   bool background_downloads_enabled_;
@@ -12,7 +12,7 @@ author: Jan Engelhardt <jengelh@inai.de>
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -118,7 +118,7 @@ void ContentSettingsRegistry::Init() {
+@@ -117,7 +117,7 @@ void ContentSettingsRegistry::Init() {
   // WARNING: The string names of the permissions passed in below are used to
   // generate preference names and should never be changed!
 
@@ -32,7 +32,7 @@ diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
     // AC Camerfirma S.A. Chambers of Commerce Root - 2008
     // https://www.camerfirma.com
     {
-@@ -708,7 +718,9 @@ static const EVMetadata ev_root_ca_metadata[] = {
+@@ -748,7 +758,9 @@ static const EVMetadata ev_root_ca_metadata[] = {
           0xd2, 0x09, 0xb7, 0x37, 0xcb, 0xe2, 0xc1, 0x8c, 0xfb, 0x2c, 0x10,
           0xc0, 0xff, 0x0b, 0xcf, 0x0d, 0x32, 0x86, 0xfc, 0x1a, 0xa2}},
         {"2.16.840.1.114404.1.1.2.4.1", ""},
@@ -1,4 +1,4 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
+From: Jan Engelhardt <jengelh@inai.de>
 Date: Sun, 9 Nov 2014 01:54:27 +0100
 Subject: promo: disable Google promotion fetching

@@ -15,8 +15,6 @@ Whatever it is that it downloads, deactivate the one that leads to
 Google.

 References: https://github.com/iridium-browser/iridium-browser/issues/33
-
-author: Jan Engelhardt <jengelh@inai.de>
 ---
 chrome/browser/signin/signin_promo.cc | 1 +
 1 file changed, 1 insertion(+)
@@ -24,7 +24,7 @@ Subject: Modify default preferences
 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
 +++ b/chrome/browser/background/background_mode_manager.cc
-@@ -363,7 +363,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -362,7 +362,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
   registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
 #endif
@@ -36,27 +36,27 @@ 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
-@@ -858,7 +858,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -990,7 +990,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
 void ChromeContentBrowserClient::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
 -  registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, true);
 +  registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, false);
   registry->RegisterListPref(prefs::kEnableDeprecatedWebPlatformFeatures);
- }
- 
+   // Register user prefs for mapping SitePerProcess and IsolateOrigins in
+   // user policy in addition to the same named ones in Local State (which are
 diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
 --- a/chrome/browser/io_thread.cc
 +++ b/chrome/browser/io_thread.cc
-@@ -620,7 +620,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -615,7 +615,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
                                std::string());
   registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
   data_reduction_proxy::RegisterPrefs(registry);
 -  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true);
 +  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, false);
+   registry->RegisterListPref(prefs::kDnsOverHttpsServers);
+   registry->RegisterListPref(prefs::kDnsOverHttpsServerMethods);
   registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true);
-   registry->RegisterBooleanPref(prefs::kPacHttpsUrlStrippingEnabled, true);
- #if defined(OS_POSIX)
 diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc
 --- a/chrome/browser/net/prediction_options.cc
 +++ b/chrome/browser/net/prediction_options.cc
@@ -104,11 +104,11 @@ diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.h
 +        <paper-checkbox id="sendSettings">
           $i18nRaw{resetPageFeedback}</paper-checkbox>
       </div>
-     </dialog>
+     </cr-dialog>
 diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
 --- a/chrome/browser/signin/signin_promo.cc
 +++ b/chrome/browser/signin/signin_promo.cc
-@@ -391,8 +391,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
+@@ -384,8 +384,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
 void RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
@@ -117,12 +117,12 @@ diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signi
 +  registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, true);
 +  registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, false);
   registry->RegisterBooleanPref(prefs::kSignInPromoShowNTPBubble, false);
+   registry->RegisterIntegerPref(prefs::kDiceSigninUserMenuPromoCount, 0);
 }
- 
 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
-@@ -59,11 +59,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -70,11 +70,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
   registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
   registry->RegisterBooleanPref(
@@ -151,7 +151,7 @@ diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/br
 diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
 +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
-@@ -144,10 +144,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
+@@ -143,10 +143,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kLocalDiscoveryNotificationsEnabled,
@@ -177,7 +177,7 @@ 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
-@@ -216,7 +216,7 @@ void AutofillManager::RegisterProfilePrefs(
+@@ -227,7 +227,7 @@ void AutofillManager::RegisterProfilePrefs(
   registry->RegisterIntegerPref(
       prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
   registry->RegisterBooleanPref(
@@ -207,7 +207,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
-@@ -334,9 +334,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -374,9 +374,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(
       prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
   registry->RegisterBooleanPref(
@@ -222,7 +222,7 @@ diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components
 diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
 --- a/extensions/common/extension.cc
 +++ b/extensions/common/extension.cc
-@@ -344,14 +344,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
+@@ -368,14 +368,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
   if (is_theme())
     return false;
 
@@ -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
-@@ -236,10 +236,10 @@ PasswordFormManager* FindMatchedManager(
+@@ -244,10 +244,10 @@ PasswordFormManager* FindMatchedManager(
 void PasswordManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -20,8 +20,8 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp
 -      prefs::kCredentialsEnableAutosignin, true,
 +      prefs::kCredentialsEnableAutosignin, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
-   registry->RegisterBooleanPref(prefs::kWasObsoleteHttpDataCleaned, false);
   registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(),
+                                PrefRegistry::NO_REGISTRATION_FLAGS);
 -- 
 2.7.4

@@ -9,8 +9,8 @@ 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
-@@ -37,16 +37,16 @@ const base::Feature* const kAllFeatures[] = {
-     nullptr};
+@@ -41,16 +41,16 @@ const base::Feature kArticleSuggestionsExpandableHeader{
+     "NTPArticleSuggestionsExpandableHeader", base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kArticleSuggestionsFeature{
 -    "NTPArticleSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -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
-@@ -78,10 +78,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -89,10 +89,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
 #endif
 #if BUILDFLAG(ENABLE_WEBRTC)
   // TODO(guoweis): Remove next 2 options at M50.
@@ -3,15 +3,15 @@ Date: Sun, 26 Nov 2017 22:51:43 +0100
 Subject: Skip the first run and metrics

 ---
- .../chrome/browser/firstrun/FirstRunStatus.java        | 11 +++++------
+ .../chrome/browser/firstrun/FirstRunStatus.java        |  8 ++++----
 .../chrome/browser/firstrun/FirstRunUtils.java         | 16 ++++++----------
 .../browser/firstrun/ToSAndUMAFirstRunFragment.java    | 18 ++++++------------
- 3 files changed, 17 insertions(+), 28 deletions(-)
+ 3 files changed, 16 insertions(+), 26 deletions(-)

 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
-@@ -36,12 +36,11 @@ public class FirstRunStatus {
+@@ -36,11 +36,11 @@ public class FirstRunStatus {
      * includes ToS and Sign In pages if necessary.
      */
     public static boolean getFirstRunFlowComplete() {
@@ -21,20 +21,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
 +        if (!complete) {
 +             setFirstRunFlowComplete(true);
         }
-        return CommandLine.isInitialized()
-                && CommandLine.getInstance().hasSwitch(
-                           ChromeSwitches.FORCE_FIRST_RUN_FLOW_COMPLETE_FOR_TESTING);
+-        return CommandLine.getInstance().hasSwitch(
+-                ChromeSwitches.FORCE_FIRST_RUN_FLOW_COMPLETE_FOR_TESTING);
 +        return true;
     }
 
     /**
-@@ -77,4 +76,4 @@ public class FirstRunStatus {
-         return ContextUtils.getAppSharedPreferences().getBoolean(
-                 LIGHTWEIGHT_FIRST_RUN_FLOW_COMPLETE, false);
-     }
-}
-\ No newline at end of file
-+}
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
@@ -64,7 +56,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/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
-@@ -73,20 +73,14 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
+@@ -74,20 +74,14 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
             }
         });
 
@@ -9,7 +9,7 @@ Subject: Disable Omaha update checks
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
-@@ -122,7 +122,7 @@ public class OmahaBase {
+@@ -132,7 +132,7 @@ public class OmahaBase {
 
     /** See {@link #sIsDisabled}. */
     static boolean isDisabled() {
@@ -9,9 +9,9 @@ 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
-@@ -601,6 +601,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
-     const GURL& embedding_origin) {
-   GURL canonical_requesting_origin = GetCanonicalOrigin(requesting_origin);
+@@ -632,6 +632,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
+   GURL canonical_requesting_origin =
+       GetCanonicalOrigin(requesting_origin, embedding_origin);
   PermissionContextBase* context = GetPermissionContext(permission);
 +  if (context == nullptr) {
 +      return PermissionResult(CONTENT_SETTING_BLOCK, PermissionStatusSource::UNSPECIFIED);
@@ -12,7 +12,7 @@ Limit threads auto-detect only for iOS
 diff --git a/content/renderer/media_recorder/h264_encoder.cc b/content/renderer/media_recorder/h264_encoder.cc
 --- a/content/renderer/media_recorder/h264_encoder.cc
 +++ b/content/renderer/media_recorder/h264_encoder.cc
-@@ -146,11 +146,11 @@ void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) {
+@@ -149,11 +149,11 @@ void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) {
     init_params.iRCMode = RC_OFF_MODE;
   }
 
@@ -3,35 +3,36 @@ Date: Sat, 28 Oct 2017 10:09:41 +0200
 Subject: Cure AMP and tracking from search results

 ---
- third_party/WebKit/Source/core/dom/BUILD.gn           |  1 +
- third_party/WebKit/Source/core/dom/Document.cpp       | 19 ++++++++++++++++++-
- .../WebKit/Source/core/dom/extensions/anti_amp_cure.h |  6 ++++++
- 3 files changed, 25 insertions(+), 1 deletion(-)
- create mode 100644 third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h
+ third_party/blink/renderer/core/dom/BUILD.gn         |  1 +
+ third_party/blink/renderer/core/dom/document.cc      | 20 +++++++++++++++++++-
+ .../renderer/core/dom/extensions/anti_amp_cure.h     |  6 ++++++
+ 3 files changed, 26 insertions(+), 1 deletion(-)
+ create mode 100644 third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h

-diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/Source/core/dom/BUILD.gn
--- a/third_party/WebKit/Source/core/dom/BUILD.gn
-+++ b/third_party/WebKit/Source/core/dom/BUILD.gn
-@@ -296,6 +296,7 @@ blink_core_sources("dom") {
-     "events/TreeScopeEventContext.h",
-     "events/WindowEventContext.cpp",
-     "events/WindowEventContext.h",
+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,7 @@ blink_core_sources("dom") {
+     "events/tree_scope_event_context.h",
+     "events/window_event_context.cc",
+     "events/window_event_context.h",
 +    "extensions/dont-track-me.h",
-     "ng/flat_tree_traversal_ng.cc",
-     "ng/flat_tree_traversal_ng.h",
-     "trustedtypes/TrustedHTML.cpp",
-diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
--- a/third_party/WebKit/Source/core/dom/Document.cpp
-+++ b/third_party/WebKit/Source/core/dom/Document.cpp
-@@ -220,6 +220,7 @@
- #include "core/xml/parser/XMLDocumentParser.h"
- #include "core/xml_names.h"
- #include "core/xmlns_names.h"
+     "exception_code.h",
+     "first_letter_pseudo_element.cc",
+     "first_letter_pseudo_element.h",
+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
+@@ -276,6 +276,8 @@
+ #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h"
+ #include "third_party/blink/renderer/platform/wtf/time.h"
+ 
 +#include "extensions/anti_amp_cure.h"
- #include "platform/CrossThreadFunctional.h"
- #include "platform/DateComponents.h"
- #include "platform/EventDispatchForbiddenScope.h"
-@@ -5858,8 +5859,24 @@ void Document::FinishedParsing() {
+
+ #ifndef NDEBUG
+ using WeakDocumentSet =
+     blink::PersistentHeapHashSet<blink::WeakMember<blink::Document>>;
+@@ -5839,8 +5841,24 @@ void Document::FinishedParsing() {
     fetcher_->ClearResourcesFromPreviousFetcher();
   }
 
@@ -57,15 +58,15 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi
 }
 
 void Document::ElementDataCacheClearTimerFired(TimerBase*) {
-diff --git a/third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h b/third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h
+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
-+++ b/third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h
+++ b/third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h
@@ -0,0 +1,6 @@
 +#ifndef anti_amp_cure_h
 +#define anti_amp_cure_h
 +
-+#define ANTI_AMP_CURE_JS "/* Bromite click-tracking and AMP removal v0.3.5 */\n\nfunction recreateHyperlink(a) {\n    // skip already-sanitized hyperlinks\n    if (a.sane) return false;\n\n    // create new A element - old one has event listeners attached\n    var newA = document.createElement('a');\n    newA.referrerPolicy = 'origin';\n    // property set when hyperlink has been created by this script\n    newA.sane = 1;\n\n    // remove AMP class, get actual page URL\n    var ampCur = a.getAttribute('data-amp-cur');\n    if (ampCur) {\n        newA.href = ampCur;\n        a.classList.remove('amp_r');\n    } else {\n        var realLink = getRealLinkFromGoogleUrl(a);\n        if (realLink) {\n            newA.href = realLink;\n        } else {\n            // might not be an actual hyperlink, ignore it\n            if (!a.href) {\n                return false;\n            }\n            // leave original href unchanged\n            newA.href = a.href;\n        }\n    }\n    // copy CSS classes\n    newA.className = a.className;\n\n    // copy nodes inside the hyperlink\n    while (a.firstChild) {\n        newA.appendChild(a.lastChild);\n    }\n    // replace hyperlink\n    a.parentNode.replaceChild(newA, a);\n    return true;\n}\n\nfunction isResult(a) {\n    if (a.getAttribute('data-amp-cur'))\n        return true;\n    var inlineMousedown = a.getAttribute('onmousedown');\n    if (!inlineMousedown)\n\treturn false;\n    // return rwt(....); // E.g Google search results.\n    // return google.rwt(...); // E.g. sponsored search results\n    // return google.arwt(this); // E.g. sponsored search results (dec 2016).\n    return /\\ba?rwt\\(/.test(inlineMousedown) || /\\bctpacw\\b/.test(inlineMousedown);\n}\n\n/**\n * @returns {String} the real URL if the given link is a Google redirect URL.\n */\nfunction getRealLinkFromGoogleUrl(a) {\n    if ((a.hostname === location.hostname || a.hostname.indexOf('www.google.') == 0) &&\n        /^\\/(local_)?url$/.test(a.pathname)) {\n        // Google Maps / Dito (/local_url?q=<url>)\n        // Mobile (/url?q=<url>)\n        var url = /[?&](?:q|url)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);\n        if (url) {\n            return decodeURIComponent(url[1]);\n        }\n        // Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)\n        url = /[?&](?:q|url)=((?:%2[Ff]|\\/)[^&]+)/.exec(a.search);\n        if (url) {\n            return a.origin + decodeURIComponent(url[1]);\n        }\n    }\n}\n\nfunction sanitizeAds() {\n    // scan all divs\n    var div = document.getElementById('tads');\n    if (div) {\n        div.style.display = 'none';\n\treturn true;\n    }\n    return false;\n}\n\nfunction sanitizeAll() {\n      console.log(\"ads removed: \", sanitizeAds());\n      console.log(\"hyperlinks sanitized: \", sanitizeAllHyperlinks());\n}\n\nfunction setMlogoClick() {\n      var mlogo = document.getElementById('mlogo');\n      if (mlogo) {\n        mlogo.removeAttribute(\"href\");\n        mlogo.setAttribute(\"onclick\", \"sanitizeAll()\");\n        console.log(\"logo link replaced\");\n      } else {\n        console.log(\"could not replace logo link\");\n      }\n}\n\nfunction sanitizeAllHyperlinks() {\n    var saned = 0, total = 0;\n    document.querySelectorAll('div[data-hveid]:not([data-hveid=\"\"]) a').forEach(function(a) {\n\ttotal++;\n\tvar res = recreateHyperlink(a);\n\tif (res) saned++;\n    });\n    console.log(\"sanitized \", saned, \"/\", total, \" hyperlinks\");\n\n    return saned;\n}\n\n// avoid running cleanup on non-search pages\nif ((document.location.host.indexOf(\"images.google.\") == -1) && (document.location.host.indexOf(\"news.google.\") == -1)) {\n//    document.addEventListener('touchstart', handlePointerPress, true);\n    sanitizeAll();\n}\nsetMlogoClick();\n"
+#define ANTI_AMP_CURE_JS "/* Bromite click-tracking and AMP removal v0.3.5 */\n\nfunction recreateHyperlink(a) {\n    // skip already-sanitized hyperlinks\n    if (a.sane) return false;\n\n    // create new A element - old one has event listeners attached\n    var newA = document.createElement('a');\n    newA.referrerPolicy = 'origin';\n    // property set when hyperlink has been created by this script\n    newA.sane = 1;\n\n    // remove AMP class, get actual page URL\n    var ampCur = a.getAttribute('data-amp-cur');\n    if (ampCur) {\n        newA.href = ampCur;\n        a.classList.remove('amp_r');\n    } else {\n        var realLink = getRealLinkFromGoogleUrl(a);\n        if (realLink) {\n            newA.href = realLink;\n        } else {\n            // might not be an actual hyperlink, ignore it\n            if (!a.href) {\n                return false;\n            }\n            // leave original href unchanged\n            newA.href = a.href;\n        }\n    }\n    // copy CSS classes\n    newA.className = a.className;\n\n    // copy nodes inside the hyperlink\n    while (a.firstChild) {\n        newA.appendChild(a.lastChild);\n    }\n    // replace hyperlink\n    a.parentNode.replaceChild(newA, a);\n    return true;\n}\n\nfunction isResult(a) {\n    if (a.getAttribute('data-amp-cur'))\n        return true;\n    var inlineMousedown = a.getAttribute('onmousedown');\n    if (!inlineMousedown)\n\treturn false;\n    // return rwt(....); // E.g Google search results.\n    // return google.rwt(...); // E.g. sponsored search results\n    // return google.arwt(this); // E.g. sponsored search results (dec 2016).\n    return /\\ba?rwt\\(/.test(inlineMousedown) || /\\bctpacw\\b/.test(inlineMousedown);\n}\n\n/**\n * @returns {String} the real URL if the given link is a Google redirect URL.\n */\nfunction getRealLinkFromGoogleUrl(a) {\n    if ((a.hostname === location.hostname || a.hostname.indexOf('www.google.') == 0) &&\n        /^\\/(local_)?url$/.test(a.pathname)) {\n        // Google Maps / Dito (/local_url?q=<url>)\n        // Mobile (/url?q=<url>)\n        var url = /[?&](?:q|url)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);\n        if (url) {\n            return decodeURIComponent(url[1]);\n        }\n        // Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)\n        url = /[?&](?:q|url)=((?:%2[Ff]|\\/)[^&]+)/.exec(a.search);\n        if (url) {\n            return a.origin + decodeURIComponent(url[1]);\n        }\n    }\n}\n\nfunction sanitizeAds() {\n    // scan all divs\n    var div = document.getElementById('tads');\n    if (div) {\n        div.style.display = 'none';\n\treturn true;\n    }\n    return false;\n}\n\nfunction sanitizeAll() {\n      console.log(\"ads removed: \", sanitizeAds());\n      console.log(\"hyperlinks sanitized: \", sanitizeAllHyperlinks(document));\n}\n\nfunction hookMoreResults() {\n      var extrares = document.getElementById('extrares');\n      if (!extrares) {\n         console.log(\"could not hook more results\");\n         return;\n      }\n      // mutation observers are great but they don't work\n      extrares.addEventListener(\"DOMNodeInserted\", function(e) {\n         var node = e.target;\n         if (node.id && node.id.startsWith(\"arc-srp\"))\n             console.log(\"hyperlinks sanitized on new result node: \", sanitizeAllHyperlinks(node));\n      });\n}\n\nfunction setMlogoClick() {\n      var mlogo = document.getElementById('qslc');\n      if (mlogo && mlogo.children[0]) {\n        mlogo = mlogo.children[0];\n        mlogo.removeAttribute(\"href\");\n        mlogo.setAttribute(\"onclick\", \"sanitizeAll()\");\n        console.log(\"logo link replaced\");\n      } else {\n        console.log(\"could not replace logo link\");\n      }\n}\n\nfunction sanitizeAllHyperlinks(rootNode) {\n    var saned = 0, total = 0;\n    rootNode.querySelectorAll('div[data-hveid]:not([data-hveid=\"\"]) a').forEach(function(a) {\n\ttotal++;\n\tvar res = recreateHyperlink(a);\n\tif (res) saned++;\n    });\n    console.log(\"sanitized \", saned, \"/\", total, \" hyperlinks\");\n\n    return saned;\n}\n\n// avoid running cleanup on non-search pages\nif ((document.location.host.indexOf(\"images.google.\") == -1) && (document.location.host.indexOf(\"news.google.\") == -1)) {\n    sanitizeAll();\n}\nsetMlogoClick();\n\nhookMoreResults();\n"
 +
 +#endif  // anti_amp_cure_h
 -- 
@@ -5,35 +5,35 @@ Subject: Play videos in background
 Break Page Visibility API and Fullscreen API for youtube.com and vimeo.com
 Original Javascript code by timdream
 ---
- third_party/WebKit/Source/core/dom/BUILD.gn             |  1 +
- third_party/WebKit/Source/core/dom/Document.cpp         | 17 +++++++++++++----
- .../WebKit/Source/core/dom/extensions/video_bg_play.h   |  6 ++++++
+ third_party/blink/renderer/core/dom/BUILD.gn            |  1 +
+ third_party/blink/renderer/core/dom/document.cc         | 17 +++++++++++++----
+ .../blink/renderer/core/dom/extensions/video_bg_play.h  |  6 ++++++
 3 files changed, 20 insertions(+), 4 deletions(-)
- create mode 100644 third_party/WebKit/Source/core/dom/extensions/video_bg_play.h
+ create mode 100644 third_party/blink/renderer/core/dom/extensions/video_bg_play.h

-diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/Source/core/dom/BUILD.gn
--- a/third_party/WebKit/Source/core/dom/BUILD.gn
-+++ b/third_party/WebKit/Source/core/dom/BUILD.gn
-@@ -297,6 +297,7 @@ blink_core_sources("dom") {
-     "events/WindowEventContext.cpp",
-     "events/WindowEventContext.h",
+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
+@@ -148,6 +148,7 @@ blink_core_sources("dom") {
+     "events/window_event_context.cc",
+     "events/window_event_context.h",
     "extensions/dont-track-me.h",
 +    "extensions/video-bg-play.h",
-     "ng/flat_tree_traversal_ng.cc",
-     "ng/flat_tree_traversal_ng.h",
-     "trustedtypes/TrustedHTML.cpp",
-diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
--- a/third_party/WebKit/Source/core/dom/Document.cpp
-+++ b/third_party/WebKit/Source/core/dom/Document.cpp
+     "exception_code.h",
+     "first_letter_pseudo_element.cc",
+     "first_letter_pseudo_element.h",
+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
@@ -221,6 +221,7 @@
- #include "core/xml_names.h"
- #include "core/xmlns_names.h"
- #include "extensions/anti_amp_cure.h"
+ #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"
 +#include "extensions/video_bg_play.h"
- #include "platform/CrossThreadFunctional.h"
- #include "platform/DateComponents.h"
- #include "platform/EventDispatchForbiddenScope.h"
-@@ -5866,17 +5867,25 @@ void Document::FinishedParsing() {
+ #include "third_party/blink/renderer/core/paint/compositing/paint_layer_compositor.h"
+ #include "third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h"
+ #include "third_party/blink/renderer/core/policy/document_policy.h"
+@@ -5848,17 +5849,25 @@ void Document::FinishedParsing() {
 
   // determine whether this is a Google search results page
   const SecurityOrigin *origin = GetSecurityOrigin();
@@ -63,10 +63,10 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi
 }
 
 void Document::ElementDataCacheClearTimerFired(TimerBase*) {
-diff --git a/third_party/WebKit/Source/core/dom/extensions/video_bg_play.h b/third_party/WebKit/Source/core/dom/extensions/video_bg_play.h
+diff --git a/third_party/blink/renderer/core/dom/extensions/video_bg_play.h b/third_party/blink/renderer/core/dom/extensions/video_bg_play.h
 new file mode 100644
 --- /dev/null
-+++ b/third_party/WebKit/Source/core/dom/extensions/video_bg_play.h
+++ b/third_party/blink/renderer/core/dom/extensions/video_bg_play.h
@@ -0,0 +1,6 @@
 +#ifndef video_bg_play_h
 +#define video_bg_play_h
@@ -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
-@@ -76,12 +76,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) {
+@@ -77,12 +77,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) {
   ShowSingletonTabOverwritingNTP(browser, 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
-@@ -386,6 +380,7 @@ void ShowSearchEngineSettings(Browser* browser) {
+@@ -397,6 +391,7 @@ void ShowSearchEngineSettings(Browser* browser) {
 #if !defined(OS_ANDROID)
 void ShowBrowserSignin(Browser* browser,
                        signin_metrics::AccessPoint access_point) {
@@ -31,9 +31,9 @@ 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);
-@@ -426,6 +421,7 @@ void ShowBrowserSignin(Browser* browser,
-             false));
-     DCHECK_GT(browser->tab_strip_model()->count(), 0);
+@@ -442,6 +437,7 @@ void ShowBrowserSignin(Browser* browser,
+         BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN,
+         signin::ManageAccountsParams(), access_point, false);
   }
 +#endif 
 }
@@ -3,13 +3,13 @@ Date: Mon, 12 Feb 2018 21:21:36 +0100
 Subject: ungoogled-chromium: Disable webRTC log uploader

 ---
- chrome/browser/media/webrtc/webrtc_log_uploader.cc | 62 ++--------------------
- 1 file changed, 4 insertions(+), 58 deletions(-)
+ chrome/browser/media/webrtc/webrtc_log_uploader.cc | 28 ++++------------------
+ 1 file changed, 4 insertions(+), 24 deletions(-)

 diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
 --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
 +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -115,30 +115,10 @@ void WebRtcLogUploader::LoggingStoppedDoUpload(
+@@ -115,30 +115,7 @@ void WebRtcLogUploader::LoggingStoppedDoUpload(
   DCHECK(meta_data.get());
   DCHECK(!upload_done_data.log_path.empty());
 
@@ -18,8 +18,8 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser
 -
 -  std::string local_log_id;
 -
-   if (base::PathExists(upload_done_data.log_path)) {
-     WebRtcLogUtil::DeleteOldWebRtcLogFiles(upload_done_data.log_path);
+-  if (base::PathExists(upload_done_data.log_path)) {
+-    webrtc_logging::DeleteOldWebRtcLogFiles(upload_done_data.log_path);
 -
 -    local_log_id = base::NumberToString(base::Time::Now().ToDoubleT());
 -    base::FilePath log_file_path =
@@ -28,10 +28,10 @@ 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 =
-        WebRtcLogList::GetWebRtcLogListFileForDirectory(
+-        webrtc_logging::LogList::GetWebRtcLogListFileForDirectory(
 -            upload_done_data.log_path);
 -    AddLocallyStoredLogInfoToUploadListFile(log_list_path, local_log_id);
-   }
+-  }
 -
 -  WebRtcLogUploadDoneData upload_done_data_with_log_id = upload_done_data;
 -  upload_done_data_with_log_id.local_log_id = local_log_id;
@@ -41,7 +41,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser
 }
 
 void WebRtcLogUploader::PrepareMultipartPostData(
-@@ -149,6 +129,9 @@ void WebRtcLogUploader::PrepareMultipartPostData(
+@@ -149,6 +126,9 @@ void WebRtcLogUploader::PrepareMultipartPostData(
   DCHECK(!compressed_log.empty());
   DCHECK(meta_data.get());
 
@@ -51,50 +51,6 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser
   std::unique_ptr<std::string> post_data(new std::string());
   SetupMultipart(post_data.get(),
                  compressed_log,
-@@ -237,43 +220,6 @@ void WebRtcLogUploader::LoggingStoppedDoStore(
- 
-   WebRtcLogUtil::DeleteOldWebRtcLogFiles(log_paths.log_path);
- 
-  base::FilePath log_list_path =
-      WebRtcLogList::GetWebRtcLogListFileForDirectory(log_paths.log_path);
-
-  // Store the native log with a ".gz" extension.
-  std::string compressed_log;
-  CompressLog(&compressed_log, log_buffer.get());
-  base::FilePath native_log_path = log_paths.log_path.AppendASCII(log_id)
-      .AddExtension(FILE_PATH_LITERAL(".gz"));
-  WriteCompressedLogToFile(compressed_log, native_log_path);
-  AddLocallyStoredLogInfoToUploadListFile(log_list_path, log_id);
-
-  // Move the rtp dump files to the log directory with a name of
-  // <log id>.rtp_[in|out].
-  if (!log_paths.incoming_rtp_dump.empty()) {
-    base::FilePath rtp_path = log_paths.log_path.AppendASCII(log_id)
-        .AddExtension(FILE_PATH_LITERAL(".rtp_in"));
-    base::Move(log_paths.incoming_rtp_dump, rtp_path);
-  }
-
-  if (!log_paths.outgoing_rtp_dump.empty()) {
-    base::FilePath rtp_path = log_paths.log_path.AppendASCII(log_id)
-        .AddExtension(FILE_PATH_LITERAL(".rtp_out"));
-    base::Move(log_paths.outgoing_rtp_dump, rtp_path);
-  }
-
-  if (meta_data.get() && !meta_data->empty()) {
-    base::Pickle pickle;
-    for (const auto& it : *meta_data.get()) {
-      pickle.WriteString(it.first);
-      pickle.WriteString(it.second);
-    }
-    base::FilePath meta_path = log_paths.log_path.AppendASCII(log_id)
-        .AddExtension(FILE_PATH_LITERAL(".meta"));
-    base::WriteFile(meta_path, static_cast<const char*>(pickle.data()),
-        pickle.size());
-  }
-
-   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-                           base::BindOnce(done_callback, true, ""));
- 
 -- 
 2.7.4

@@ -50,7 +50,7 @@ diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser
 diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/browser/safe_browsing/client_side_model_loader.cc
 --- a/chrome/browser/safe_browsing/client_side_model_loader.cc
 +++ b/chrome/browser/safe_browsing/client_side_model_loader.cc
-@@ -34,8 +34,6 @@ namespace safe_browsing {
+@@ -35,8 +35,6 @@ namespace safe_browsing {
 // Model Loader strings
 const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
 const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
@@ -59,39 +59,39 @@ diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/b
 const char ModelLoader::kClientModelNamePattern[] =
     "client_model_v5%s_variation_%d.pb";
 const char ModelLoader::kClientModelFinchExperiment[] =
-@@ -88,7 +86,7 @@ ModelLoader::ModelLoader(base::Closure update_renderers_callback,
-                          net::URLRequestContextGetter* request_context_getter,
-                          bool is_extended_reporting)
+@@ -90,7 +88,7 @@ ModelLoader::ModelLoader(
+     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
+     bool is_extended_reporting)
     : name_(FillInModelName(is_extended_reporting, GetModelNumber())),
 -      url_(kClientModelUrlPrefix + name_),
 +      url_("about:blank"),
       update_renderers_callback_(update_renderers_callback),
-       request_context_getter_(request_context_getter),
+       url_loader_factory_(url_loader_factory),
       weak_factory_(this) {
-@@ -99,7 +97,7 @@ ModelLoader::ModelLoader(base::Closure update_renderers_callback,
- ModelLoader::ModelLoader(base::Closure update_renderers_callback,
-                          const std::string& model_name)
+@@ -103,7 +101,7 @@ ModelLoader::ModelLoader(
+     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
+     const std::string& model_name)
     : name_(model_name),
 -      url_(kClientModelUrlPrefix + name_),
 +      url_("about:blank"),
       update_renderers_callback_(update_renderers_callback),
-       request_context_getter_(NULL),
+       url_loader_factory_(url_loader_factory),
       weak_factory_(this) {
 diff --git a/chrome/browser/safe_browsing/client_side_model_loader.h b/chrome/browser/safe_browsing/client_side_model_loader.h
 --- a/chrome/browser/safe_browsing/client_side_model_loader.h
 +++ b/chrome/browser/safe_browsing/client_side_model_loader.h
-@@ -43,7 +43,6 @@ class ModelLoader : public net::URLFetcherDelegate {
+@@ -42,7 +42,6 @@ class ModelLoader {
   static const int kClientModelFetchIntervalMs;
   static const char kClientModelFinchExperiment[];
   static const char kClientModelFinchParam[];
 -  static const char kClientModelUrlPrefix[];
   static const char kClientModelNamePattern[];
 
-   // Constructs a model loader to fetch a model using |request_context_getter|.
+   // Constructs a model loader to fetch a model using |url_loader_factory|.
 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
-@@ -366,7 +366,7 @@ bool FinancialPing::PingServer(const char* request, std::string* response) {
+@@ -351,7 +351,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request,
 
   // Open network connection.
   InternetHandle connection_handle = InternetConnectA(inet_handle,
@@ -99,9 +99,9 @@ diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
 +      "about:blank", kFinancialPort, "", "", INTERNET_SERVICE_HTTP,
       INTERNET_FLAG_NO_CACHE_WRITE, 0);
   if (!connection_handle)
-     return false;
-@@ -410,7 +410,7 @@ bool FinancialPing::PingServer(const char* request, std::string* response) {
-   return true;
+     return PING_FAILURE;
+@@ -395,7 +395,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request,
+   return PING_SUCCESSFUL;
 #else
   std::string url =
 -      base::StringPrintf("https://%s%s", kFinancialServer, request);
@@ -12,8 +12,8 @@ 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
-@@ -72,9 +72,7 @@ void IntranetRedirectDetector::FinishSleep() {
-   fetchers_.clear();
+@@ -75,9 +75,7 @@ void IntranetRedirectDetector::FinishSleep() {
+   simple_loaders_.clear();
   resulting_origins_.clear();
 
 -  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
@@ -21,7 +21,7 @@ diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intra
 -    return;
 +  return;
 
-   DCHECK(fetchers_.empty() && resulting_origins_.empty());
+   DCHECK(simple_loaders_.empty() && resulting_origins_.empty());
 
 -- 
 2.7.4
@@ -7,14 +7,14 @@ 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      | 193 ++-------------------
- components/search_engines/template_url.cc          |   5 -
+ components/search_engines/template_url.cc          |   6 +-
 net/base/url_util.cc                               |  22 ---
- 5 files changed, 13 insertions(+), 244 deletions(-)
+ 5 files changed, 14 insertions(+), 244 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
 +++ b/chrome/browser/page_load_metrics/page_load_metrics_util.cc
-@@ -164,9 +164,7 @@ bool DidObserveLoadingBehaviorInAnyFrame(
+@@ -169,9 +169,7 @@ bool DidObserveLoadingBehaviorInAnyFrame(
 }
 
 bool IsGoogleSearchHostname(const GURL& url) {
@@ -324,22 +324,23 @@ 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
-@@ -455,11 +455,6 @@ base::string16 TemplateURLRef::SearchTermToString16(
+@@ -510,11 +510,7 @@ base::string16 TemplateURLRef::SearchTermToString16(
 bool TemplateURLRef::HasGoogleBaseURLs(
     const SearchTermsData& search_terms_data) const {
   ParseIfNecessary(search_terms_data);
-  for (size_t i = 0; i < replacements_.size(); ++i) {
-    if ((replacements_[i].type == GOOGLE_BASE_URL) ||
-        (replacements_[i].type == GOOGLE_BASE_SUGGEST_URL))
-      return true;
-  }
-   return false;
+-  return std::any_of(replacements_.begin(), replacements_.end(),
+-                     [](const Replacement& replacement) {
+-                       return replacement.type == GOOGLE_BASE_URL ||
+-                              replacement.type == GOOGLE_BASE_SUGGEST_URL;
+-                     });
+  return false;
 }
 
+ bool TemplateURLRef::ExtractSearchTermsFromURL(
 diff --git a/net/base/url_util.cc b/net/base/url_util.cc
 --- a/net/base/url_util.cc
 +++ b/net/base/url_util.cc
-@@ -397,28 +397,6 @@ void GetIdentityFromURL(const GURL& url,
+@@ -383,28 +383,6 @@ void GetIdentityFromURL(const GURL& url,
 }
 
 bool HasGoogleHost(const GURL& url) {
@@ -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
-@@ -481,6 +481,7 @@ void GCMClientImpl::StartGCM() {
+@@ -502,6 +502,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();
-@@ -678,6 +679,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) {
+@@ -699,6 +700,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_.get())
     return;
-@@ -756,6 +758,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) {
+@@ -777,6 +779,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
-@@ -307,7 +307,6 @@
+@@ -301,7 +301,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" />
-@@ -445,7 +444,6 @@
+@@ -436,7 +435,6 @@
       </if>
       <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" />
@@ -93,7 +93,7 @@ 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
-@@ -219,35 +219,6 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
+@@ -248,35 +248,6 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
     int load_flags,
     const net::NetworkTrafficAnnotationTag& traffic_annotation) {
   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
@@ -19,7 +19,7 @@ Adds a menu item under "More tools" to clear the HTTP authentication cache on de
 diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h
 --- a/chrome/app/chrome_command_ids.h
 +++ b/chrome/app/chrome_command_ids.h
-@@ -148,6 +148,7 @@
+@@ -152,6 +152,7 @@
 #define IDC_DEV_TOOLS_INSPECT           40023
 #define IDC_UPGRADE_DIALOG              40024
 #define IDC_VIEW_INCOMPATIBILITIES      40025
@@ -30,7 +30,7 @@ diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h
 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -1064,6 +1064,9 @@ are declared in build/common.gypi.
+@@ -1053,6 +1053,9 @@ are declared in build/common.gypi.
         <message name="IDS_CLEAR_BROWSING_DATA" desc="The text label for the menu item for clearing of browsing data">
           &amp;Clear browsing data...
         </message>
@@ -40,7 +40,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
         <message name="IDS_SHOW_DOWNLOADS" desc="The show downloads menu in the app menu">
           &amp;Downloads
         </message>
-@@ -1102,6 +1105,9 @@ are declared in build/common.gypi.
+@@ -1091,6 +1094,9 @@ are declared in build/common.gypi.
         <message name="IDS_CLEAR_BROWSING_DATA" desc="In Title Case: The text label for the menu item for clearing of browsing data">
           &amp;Clear Browsing Data...
         </message>
@@ -53,9 +53,9 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
 diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
 --- a/chrome/browser/ui/browser_command_controller.cc
 +++ b/chrome/browser/ui/browser_command_controller.cc
-@@ -58,6 +58,9 @@
+@@ -60,6 +60,9 @@
 #include "extensions/browser/extension_system.h"
- #include "printing/features/features.h"
+ #include "printing/buildflags/buildflags.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 +#include "net/url_request/url_request_context.h"
 +#include "net/url_request/url_request_context_getter.h"
@@ -63,7 +63,7 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/ui/browser_commands_mac.h"
-@@ -625,6 +628,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
+@@ -629,6 +632,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
     case IDC_CLEAR_BROWSING_DATA:
       ShowClearBrowsingDataDialog(browser_);
       break;
@@ -73,7 +73,7 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui
     case IDC_IMPORT_SETTINGS:
       ShowImportDialog(browser_);
       break;
-@@ -867,6 +873,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -871,6 +877,7 @@ void BrowserCommandController::InitCommandState() {
                                         !profile()->IsOffTheRecord());
   command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA,
                                         !guest_session);
@@ -157,7 +157,7 @@ diff --git a/net/http/http_auth_cache.h b/net/http/http_auth_cache.h
 diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
 --- a/tools/metrics/histograms/enums.xml
 +++ b/tools/metrics/histograms/enums.xml
-@@ -46154,6 +46154,7 @@ Called by update_traffic_annotation_histograms.py.-->
+@@ -48309,6 +48309,7 @@ Full version information for the fingerprint enum values:
   <int value="48" label="Open in Chrome"/>
   <int value="49" label="Site Settings"/>
   <int value="50" label="App Info"/>
@@ -168,7 +168,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums
 diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
 --- a/tools/metrics/histograms/histograms.xml
 +++ b/tools/metrics/histograms/histograms.xml
-@@ -102544,6 +102544,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
+@@ -107908,6 +107908,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <suffix name="Overestimate"
       label="Tracks when the compositor's estimates were too high and by how
              much."/>
@@ -14,7 +14,7 @@ Subject: url_request: hooks and ad url data
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1739,6 +1739,8 @@ component("net") {
+@@ -1756,6 +1756,8 @@ component("net") {
       "url_request/url_fetcher_response_writer.h",
       "url_request/url_range_request_job.cc",
       "url_request/url_range_request_job.h",
@@ -173,9 +173,9 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 +#include "net/url_request/nochromo_intercept.h"
 +
 #if BUILDFLAG(ENABLE_REPORTING)
- #include "net/url_request/network_error_logging_delegate.h"
- #endif  // BUILDFLAG(ENABLE_REPORTING)
-@@ -581,6 +583,8 @@ URLRequest::URLRequest(const GURL& url,
+ #include "net/network_error_logging/network_error_logging_service.h"
+ #include "net/reporting/reporting_service.h"
+@@ -583,6 +585,8 @@ URLRequest::URLRequest(const GURL& url,
   // Sanity check out environment.
   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
 
@@ -22,7 +22,7 @@ Re-land: third-party filters support
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1739,8 +1739,6 @@ component("net") {
+@@ -1756,8 +1756,6 @@ component("net") {
       "url_request/url_fetcher_response_writer.h",
       "url_request/url_range_request_job.cc",
       "url_request/url_range_request_job.h",
@@ -31,7 +31,7 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn
       "url_request/url_request.cc",
       "url_request/url_request.h",
       "url_request/url_request_context.cc",
-@@ -1801,6 +1799,13 @@ component("net") {
+@@ -1815,6 +1813,13 @@ component("net") {
       "//third_party/zlib",
     ]
 
@@ -44,7 +44,7 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn
 +
     if (enable_reporting) {
       sources += [
-         "network_error_logging/network_error_logging_service.cc",
+         "network_error_logging/network_error_logging_delegate.cc",
 diff --git a/net/url_request/adblock_intercept.cc b/net/url_request/adblock_intercept.cc
 new file mode 100644
 --- /dev/null
@@ -548,18 +548,18 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 +#endif
 
 #if BUILDFLAG(ENABLE_REPORTING)
- #include "net/url_request/network_error_logging_delegate.h"
-@@ -558,7 +560,9 @@ URLRequest::URLRequest(const GURL& url,
+ #include "net/network_error_logging/network_error_logging_service.h"
+@@ -559,7 +561,9 @@ URLRequest::URLRequest(const GURL& url,
                                          : context->network_delegate()),
       net_log_(NetLogWithSource::Make(context->net_log(),
                                       NetLogSourceType::URL_REQUEST)),
 +#if !defined(OS_ANDROID)
       url_chain_(1, url),
 +#endif
+       attach_same_site_cookies_(false),
       method_("GET"),
       referrer_policy_(CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE),
-       first_party_url_policy_(NEVER_CHANGE_FIRST_PARTY_URL),
-@@ -583,7 +587,18 @@ URLRequest::URLRequest(const GURL& url,
+@@ -585,7 +589,18 @@ URLRequest::URLRequest(const GURL& url,
   // Sanity check out environment.
   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
 
@@ -4,7 +4,7 @@ Subject: Battery API: return nothing

 ---
 services/device/battery/battery_status_service.cc  |  2 +-
- .../Source/modules/battery/BatteryManager.cpp      | 25 ++++------------------
+ .../renderer/modules/battery/battery_manager.cc    | 25 ++++------------------
 2 files changed, 5 insertions(+), 22 deletions(-)

 diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
@@ -19,9 +19,9 @@ diff --git a/services/device/battery/battery_status_service.cc b/services/device
   if (callback_list_.empty()) {
     bool success = battery_fetcher_->StartListeningBatteryChange();
     // On failure pass the default values back.
-diff --git a/third_party/WebKit/Source/modules/battery/BatteryManager.cpp b/third_party/WebKit/Source/modules/battery/BatteryManager.cpp
--- a/third_party/WebKit/Source/modules/battery/BatteryManager.cpp
-+++ b/third_party/WebKit/Source/modules/battery/BatteryManager.cpp
+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
@@ -42,45 +42,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
 }
 
@@ -3,13 +3,13 @@ Date: Thu, 22 Mar 2018 22:38:00 +0100
 Subject: Disable plugins enumeration

 ---
- third_party/WebKit/Source/core/frame/LocalFrame.cpp | 6 ++----
+ third_party/blink/renderer/core/frame/local_frame.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

-diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
-+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
-@@ -1086,10 +1086,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
+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
+@@ -1175,10 +1175,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
 }
 
 PluginData* LocalFrame::GetPluginData() const {
@@ -4,14 +4,14 @@ Subject: AudioBuffer, AnalyserNode: fingerprinting mitigations via IDL

 Return fixed base latency
 ---
- third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl | 8 ++++----
- third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl  | 4 ++--
- third_party/WebKit/Source/modules/webaudio/AudioContext.cpp | 2 +-
+ third_party/blink/renderer/modules/webaudio/analyser_node.idl | 8 ++++----
+ third_party/blink/renderer/modules/webaudio/audio_buffer.idl  | 4 ++--
+ third_party/blink/renderer/modules/webaudio/audio_context.cc  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

-diff --git a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl b/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl
--- a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl
-+++ b/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl
+diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.idl b/third_party/blink/renderer/modules/webaudio/analyser_node.idl
+--- a/third_party/blink/renderer/modules/webaudio/analyser_node.idl
+++ b/third_party/blink/renderer/modules/webaudio/analyser_node.idl
@@ -42,10 +42,10 @@ interface AnalyserNode : AudioNode {
 
     // Copies the current frequency data into the passed array.
@@ -27,9 +27,9 @@ diff --git a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl b/third
 +    //void getFloatTimeDomainData(Float32Array array);
 +    //void getByteTimeDomainData(Uint8Array array);
 };
-diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl b/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl
--- a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl
-+++ b/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl
+diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
+--- a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
+++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
@@ -38,7 +38,7 @@
 
     // Channel access
@@ -40,10 +40,10 @@ diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl b/third_
 +    //[RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long startInChannel = 0);
     [RaisesException] void copyToChannel(Float32Array source, long channelNumber, optional unsigned long startInChannel = 0);
 };
-diff --git a/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp b/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp
--- a/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp
-+++ b/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp
-@@ -268,7 +268,7 @@ void AudioContext::StopRendering() {
+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
+@@ -261,7 +261,7 @@ void AudioContext::StopRendering() {
 }
 
 double AudioContext::baseLatency() const {
@@ -51,7 +51,7 @@ diff --git a/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp b/third
 +  return 0.04;
 }
 
- // TODO(crbug.com/764396): Remove these when fixed.
+ }  // namespace blink
 -- 
 2.7.4

@@ -7,10 +7,10 @@ Subject: Add menu option to toggle global Javascript preference
 chrome/android/java/res/menu/main_menu.xml         | 13 ++++++++
 .../chromium/chrome/browser/ChromeActivity.java    |  8 +++++
 .../chrome/browser/ChromeTabbedActivity.java       |  8 +++++
- .../browser/appmenu/AppMenuPropertiesDelegate.java | 35 ++++++++++++++++++++++
+ .../browser/appmenu/AppMenuPropertiesDelegate.java | 37 ++++++++++++++++++++++
 .../CustomTabAppMenuPropertiesDelegate.java        |  1 +
 .../java/strings/android_chrome_strings.grd        | 11 +++++++
- 7 files changed, 89 insertions(+)
+ 7 files changed, 91 insertions(+)

 diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
 --- a/chrome/android/java/res/menu/custom_tabs_menu.xml
@@ -61,7 +61,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
-@@ -1969,6 +1969,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2050,6 +2050,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             final boolean usingDesktopUserAgent = currentTab.getUseDesktopUserAgent();
             currentTab.setUseDesktopUserAgent(!usingDesktopUserAgent, reloadOnChange);
             RecordUserAction.record("MobileMenuRequestDesktopSite");
@@ -74,12 +74,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
 +			}
 +            RecordUserAction.record("MobileMenuRequestEnableJavascript");
         } else if (id == R.id.reader_mode_prefs_id) {
-             if (currentTab.getWebContents() != null) {
-                 RecordUserAction.record("DomDistiller_DistilledPagePrefsOpened");
+             DomDistillerUIUtils.openSettings(currentTab.getWebContents());
+         } else {
 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
-@@ -1895,6 +1895,14 @@ public class ChromeTabbedActivity
+@@ -1710,6 +1710,14 @@ public class ChromeTabbedActivity
                 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
             }
             RecordUserAction.record("MobileMenuDownloadManager");
@@ -97,7 +97,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
-@@ -225,6 +225,8 @@ public class AppMenuPropertiesDelegate {
+@@ -214,6 +214,8 @@ public class AppMenuPropertiesDelegate {
 
             updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
 
@@ -106,7 +106,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()));
-@@ -504,4 +506,37 @@ public class AppMenuPropertiesDelegate {
+@@ -469,4 +471,39 @@ public class AppMenuPropertiesDelegate {
 
         return chromeHomeMenuItemFlagEnabled && !sHideChromeHomeMenuItems;
     }
@@ -123,12 +123,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
 +        MenuItem enableMenuLabel = menu.findItem(R.id.enable_javascript_id);
 +        MenuItem enableMenuCheck = menu.findItem(R.id.enable_javascript_check_id);
 +
-+        // Hide enable javascript on all chrome:// pages and the NTP.
+        // Hide enable javascript on all chrome:// pages except for the NTP.
 +        String url = currentTab.getUrl();
 +        boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
 +                || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
+        // Also hide enable javascsript on Reader Mode.
+        boolean isDistilledPage = DomDistillerUrlUtils.isDistilledPage(url);
 +
-+        boolean itemVisible = !isChromeScheme && !currentTab.isNativePage();
+        boolean itemVisible = (!isChromeScheme || currentTab.isNativePage()) && !isDistilledPage;
 +        enableMenuRow.setVisible(itemVisible);
 +        if (!itemVisible) return;
 +
@@ -147,7 +149,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,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -171,6 +171,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
             }
 
             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
@@ -158,7 +160,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
-@@ -2506,6 +2506,17 @@ To obtain new licenses, connect to the internet and play your downloaded content
+@@ -2548,6 +2548,17 @@ Google may use your browsing activity, content on some sites you visit, and othe
       <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>
@@ -0,0 +1,45 @@
+From: SergeyZhukovsky <serg.zhukovsky@gmail.com>
+Date: Tue, 15 Aug 2017 15:33:16 -0400
+Subject: Remove google account access permission on reboot
+
+---
+ chrome/android/BUILD.gn                 | 3 +--
+ chrome/android/java/AndroidManifest.xml | 4 ++--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
+@@ -784,8 +784,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
+   resources = [
+     "java/res_template/xml/file_paths.xml",
+     "java/res_template/xml/launchershortcuts.xml",
+-    "java/res_template/xml/searchable.xml",
+-    "java/res_template/xml/syncadapter.xml",
+    "java/res_template/xml/searchable.xml"
+   ]
+   res_dir = "java/res_template"
+   variables = chrome_public_jinja_variables
+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
+@@ -804,14 +804,14 @@ by a child template that "extends" this file.
+         </provider>
+ 
+         <!-- Sync adapter for browser invalidation. -->
+-        <service android:name="org.chromium.chrome.browser.invalidation.ChromeBrowserSyncAdapterService"
+        <!--<service android:name="org.chromium.chrome.browser.invalidation.ChromeBrowserSyncAdapterService"
+             android:exported="false">
+             <intent-filter>
+                 <action android:name="android.content.SyncAdapter" />
+             </intent-filter>
+             <meta-data android:name="android.content.SyncAdapter"
+                        android:resource="@xml/syncadapter" />
+-        </service>
+        </service>-->
+ 
+         <!-- Broadcast receiver that will be notified of account changes -->
+         <receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver">
+-- 
+2.7.4
+
@@ -0,0 +1,24 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 2 Apr 2018 11:36:02 +0200
+Subject: Punt the Widevine version string
+
+Originally from http://bazaar.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.wily.beta/view/head:/debian/patches/fix_building_widevinecdm_with_chromium.patch
+---
+ chrome/common/chrome_content_client.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+@@ -526,7 +526,7 @@ void ChromeContentClient::AddContentDecryptionModules(
+     bool supports_persistent_license = false;
+     if (IsWidevineAvailable(&cdm_path, &video_codecs_supported,
+                             &supports_persistent_license)) {
+-      const base::Version version(WIDEVINE_CDM_VERSION_STRING);
+      const base::Version version("1.0.123.456");
+       DCHECK(version.IsValid());
+ 
+       cdms->push_back(content::CdmInfo(
+-- 
+2.7.4
+
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 25 Apr 2018 10:23:51 +0200
+Subject: Disable metrics on all I/O threads
+
+---
+ chrome/browser/profiles/profile_io_data.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+@@ -964,7 +964,7 @@ void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() {
+ 
+ bool ProfileIOData::GetMetricsEnabledStateOnIOThread() const {
+   DCHECK_CURRENTLY_ON(BrowserThread::IO);
+-  return enable_metrics_.GetValue();
+  return false;
+ }
+ 
+ chrome_browser_net::Predictor* ProfileIOData::GetPredictor() {
+-- 
+2.7.4
+
@@ -0,0 +1,22 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 28 Apr 2018 08:30:26 +0200
+Subject: Enable DNS-over-HTTPS by default
+
+---
+ components/network_session_configurator/common/network_features.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+@@ -10,6 +10,6 @@ const base::Feature kTokenBinding{"token-binding",
+                                   base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kDnsOverHttps{"dns-over-https",
+-                                  base::FEATURE_DISABLED_BY_DEFAULT};
+                                  base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ }  // namespace features
+-- 
+2.7.4
+
@@ -4,7 +4,7 @@ Subject: Add fingerprinting mitigation for getClientRects,
 getBoundingClientRect

 Scale the result of Range::getClientRects and Element::getBoundingClientRect
-by a random +/-5% of the original value for each float in the Rect/Quad.
+by a random +/-3% of the original value for each float in the Rect/Quad.
 The random value is generated once for each Document and re-used for all the
 attached elements.
 The rationale is that such value, albeit constant within the rendered Document,
@@ -13,36 +13,36 @@ used for fingerprinting and sufficient to poison the well.

 See also: http://www.gsd.inesc-id.pt/~mpc/pubs/fingerprinting-trustcom2016.pdf
 ---
- third_party/WebKit/Source/core/dom/Document.cpp | 14 ++++++++++++++
- third_party/WebKit/Source/core/dom/Document.h   |  5 +++++
- third_party/WebKit/Source/core/dom/Element.cpp  |  7 +++++++
- third_party/WebKit/Source/core/dom/Range.cpp    |  8 +++++++-
+ third_party/blink/renderer/core/dom/document.cc | 14 ++++++++++++++
+ third_party/blink/renderer/core/dom/document.h  |  5 +++++
+ third_party/blink/renderer/core/dom/element.cc  |  7 +++++++
+ third_party/blink/renderer/core/dom/range.cc    |  8 +++++++-
 4 files changed, 33 insertions(+), 1 deletion(-)

-diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
--- a/third_party/WebKit/Source/core/dom/Document.cpp
-+++ b/third_party/WebKit/Source/core/dom/Document.cpp
-@@ -271,6 +271,8 @@
- #include "services/service_manager/public/cpp/interface_provider.h"
- #include "third_party/WebKit/common/page/page_visibility_state.mojom-blink.h"
+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
+@@ -279,6 +279,8 @@
+ 
+ #include "extensions/anti_amp_cure.h"
 
 +#include "base/rand_util.h"
 +
 #ifndef NDEBUG
 using WeakDocumentSet =
     blink::PersistentHeapHashSet<blink::WeakMember<blink::Document>>;
-@@ -730,6 +732,10 @@ Document::Document(const DocumentInit& initializer,
+@@ -740,6 +742,10 @@ Document::Document(const DocumentInit& initializer,
 #ifndef NDEBUG
   liveDocumentSet().insert(this);
 #endif
 +
-+  // add ±5% noise against fingerprinting
-+  shuffleFactorX_ = 1 + (base::RandDouble() - 0.5) * 0.05;
-+  shuffleFactorY_ = 1 + (base::RandDouble() - 0.5) * 0.05;
+  // add +/- 3% noise against fingerprinting
+  shuffleFactorX_ = 1 + (base::RandDouble() - 0.5) * 0.03;
+  shuffleFactorY_ = 1 + (base::RandDouble() - 0.5) * 0.03;
 }
 
 Document::~Document() {
-@@ -756,6 +762,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope,
+@@ -766,6 +772,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope,
                        Position::BeforeNode(*shadow_host));
 }
 
@@ -57,12 +57,12 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi
 SelectorQueryCache& Document::GetSelectorQueryCache() {
   if (!selector_query_cache_)
     selector_query_cache_ = std::make_unique<SelectorQueryCache>();
-diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h
--- a/third_party/WebKit/Source/core/dom/Document.h
-+++ b/third_party/WebKit/Source/core/dom/Document.h
-@@ -407,6 +407,9 @@ class CORE_EXPORT Document : public ContainerNode,
+diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
+--- a/third_party/blink/renderer/core/dom/document.h
+++ b/third_party/blink/renderer/core/dom/document.h
+@@ -408,6 +408,9 @@ class CORE_EXPORT Document : public ContainerNode,
+ 
   String origin() const;
-   String suborigin() const;
 
 +  double GetShuffleFactorX();
 +  double GetShuffleFactorY();
@@ -70,7 +70,7 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/
   String visibilityState() const;
   mojom::PageVisibilityState GetPageVisibilityState() const;
   bool hidden() const;
-@@ -1671,6 +1674,8 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -1670,6 +1673,8 @@ class CORE_EXPORT Document : public ContainerNode,
 
   double start_time_;
 
@@ -79,10 +79,10 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/
   TraceWrapperMember<ScriptRunner> script_runner_;
 
   HeapVector<Member<ScriptElementBase>> current_script_stack_;
-diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
--- a/third_party/WebKit/Source/core/dom/Element.cpp
-+++ b/third_party/WebKit/Source/core/dom/Element.cpp
-@@ -1227,6 +1227,11 @@ DOMRectList* Element::getClientRects() {
+diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
+--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
+@@ -1348,6 +1348,11 @@ DOMRectList* Element::getClientRects() {
   DCHECK(element_layout_object);
   GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
       quads, *element_layout_object);
@@ -94,7 +94,7 @@ diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit
   return DOMRectList::Create(quads);
 }
 
-@@ -1244,6 +1249,8 @@ DOMRect* Element::getBoundingClientRect() {
+@@ -1365,6 +1370,8 @@ DOMRect* Element::getBoundingClientRect() {
   DCHECK(element_layout_object);
   GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
                                                         *element_layout_object);
@@ -103,10 +103,10 @@ diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit
   return DOMRect::FromFloatRect(result);
 }
 
-diff --git a/third_party/WebKit/Source/core/dom/Range.cpp b/third_party/WebKit/Source/core/dom/Range.cpp
--- a/third_party/WebKit/Source/core/dom/Range.cpp
-+++ b/third_party/WebKit/Source/core/dom/Range.cpp
-@@ -1589,11 +1589,17 @@ DOMRectList* Range::getClientRects() const {
+diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/renderer/core/dom/range.cc
+--- a/third_party/blink/renderer/core/dom/range.cc
+++ b/third_party/blink/renderer/core/dom/range.cc
+@@ -1575,11 +1575,17 @@ DOMRectList* Range::getClientRects() const {
   Vector<FloatQuad> quads;
   GetBorderAndTextQuads(quads);
 
@@ -0,0 +1,28 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 2 May 2018 01:04:07 +0200
+Subject: Disable custom tab activities permanently
+
+---
+ .../src/org/chromium/chrome/browser/LaunchIntentDispatcher.java    | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+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
+@@ -149,9 +149,10 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+         recordIntentMetrics();
+ 
+         mIsVrIntent = VrIntentUtils.isVrIntent(mIntent);
+-        boolean isCustomTabIntent = (!mIsVrIntent && isCustomTabIntent(mIntent))
+-                || (mIsVrIntent && VrIntentUtils.isCustomTabVrIntent(mIntent));
+-        mIsCustomTabIntent = isCustomTabIntent;
+        //boolean isCustomTabIntent = (!mIsVrIntent && isCustomTabIntent(mIntent))
+        //        || (mIsVrIntent && VrIntentUtils.isCustomTabVrIntent(mIntent));
+        //mIsCustomTabIntent = isCustomTabIntent;
+        mIsCustomTabIntent = false;
+     }
+ 
+     /**
+-- 
+2.7.4
+
@@ -4,15 +4,15 @@ Subject: Canvas: fingerprinting mitigations via IDL

 Disable toDataURL, toBlob, getImageData and webGL renderering info
 ---
- third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl      | 4 ++--
- .../Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl       | 4 ++--
- third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp    | 4 ++--
+ third_party/blink/renderer/core/html/canvas/html_canvas_element.idl   | 4 ++--
+ .../renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl  | 4 ++--
+ third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

-diff --git a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl b/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl
--- a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl
-+++ b/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl
-@@ -36,9 +36,9 @@ interface HTMLCanvasElement : HTMLElement
+diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl b/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl
+--- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl
+++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl
+@@ -37,9 +37,9 @@ interface HTMLCanvasElement : HTMLElement
     // Note: The arguments argument is variadic in the spec, but not here as
     // only one extra argument is actually used.
     // FIXME: type should not have a default value.
@@ -24,9 +24,9 @@ diff --git a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl b/
 };
 
 // https://html.spec.whatwg.org/multipage/canvas.html#blobcallback
-diff --git a/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl b/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl
--- a/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl
-+++ b/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl
+diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl
+--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl
@@ -110,7 +110,7 @@ interface CanvasRenderingContext2D {
     // text (see also the CanvasDrawingStyles interface)
     void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
@@ -45,9 +45,9 @@ diff --git a/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingCo
     [RaisesException] void putImageData(ImageData imagedata, long dx, long dy);
     [RaisesException] void putImageData(ImageData imagedata, long dx, long dy, long dirtyX, long dirtyY, long dirtyWidth, long dirtyHeight);
     
-diff --git a/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp b/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp
--- a/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp
-+++ b/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp
+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
+++ b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
@@ -37,11 +37,11 @@ WebGLExtensionName WebGLDebugRendererInfo::GetName() const {
 
 WebGLDebugRendererInfo* WebGLDebugRendererInfo::Create(
@@ -0,0 +1,273 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 30 Apr 2018 15:39:58 +0200
+Subject: Started work on canvas randomisation
+
+Add shuffling for TextMetrics
+---
+ .../renderer/core/html/canvas/canvas_async_blob_creator.cc | 14 +++++++-------
+ .../renderer/core/html/canvas/canvas_async_blob_creator.h  |  6 +++---
+ .../blink/renderer/core/html/canvas/html_canvas_element.cc |  4 ++--
+ .../blink/renderer/core/html/canvas/text_metrics.cc        |  4 ++++
+ third_party/blink/renderer/core/html/canvas/text_metrics.h |  2 ++
+ .../blink/renderer/core/inspector/InspectorAuditsAgent.cpp |  2 +-
+ .../renderer/core/offscreencanvas/offscreen_canvas.cc      |  6 +++++-
+ .../renderer/modules/accessibility/ax_layout_object.cc     |  2 +-
+ .../modules/canvas/canvas2d/base_rendering_context_2d.cc   |  3 +++
+ .../modules/canvas/canvas2d/canvas_rendering_context_2d.cc |  6 +++++-
+ .../blink/renderer/platform/graphics/image_data_buffer.cc  |  6 ++++--
+ .../blink/renderer/platform/graphics/image_data_buffer.h   |  3 ++-
+ 12 files changed, 39 insertions(+), 19 deletions(-)
+
+diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
+--- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
+++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
+@@ -218,14 +218,14 @@ void CanvasAsyncBlobCreator::Dispose() {
+   image_ = nullptr;
+ }
+ 
+-bool CanvasAsyncBlobCreator::EncodeImage(const double& quality) {
+bool CanvasAsyncBlobCreator::EncodeImage(const double& quality, const double shuffleAmt) {
+   std::unique_ptr<ImageDataBuffer> buffer = ImageDataBuffer::Create(src_data_);
+   if (!buffer)
+     return false;
+-  return buffer->EncodeImage("image/webp", quality, &encoded_image_);
+  return buffer->EncodeImage("image/webp", quality, shuffleAmt, &encoded_image_);
+ }
+ 
+-void CanvasAsyncBlobCreator::ScheduleAsyncBlobCreation(const double& quality) {
+void CanvasAsyncBlobCreator::ScheduleAsyncBlobCreation(const double& quality, const double shuffleAmt) {
+   if (!static_bitmap_image_loaded_) {
+     context_->GetTaskRunner(TaskType::kCanvasBlobSerialization)
+         ->PostTask(FROM_HERE,
+@@ -239,7 +239,7 @@ void CanvasAsyncBlobCreator::ScheduleAsyncBlobCreation(const double& quality) {
+       // When OffscreenCanvas.convertToBlob() occurs on worker thread,
+       // we do not need to use background task runner to reduce load on main.
+       // So we just directly encode images on the worker thread.
+-      if (!EncodeImage(quality)) {
+      if (!EncodeImage(quality, shuffleAmt)) {
+         context_->GetTaskRunner(TaskType::kCanvasBlobSerialization)
+             ->PostTask(
+                 FROM_HERE,
+@@ -258,7 +258,7 @@ void CanvasAsyncBlobCreator::ScheduleAsyncBlobCreation(const double& quality) {
+       BackgroundTaskRunner::PostOnBackgroundThread(
+           FROM_HERE,
+           CrossThreadBind(&CanvasAsyncBlobCreator::EncodeImageOnEncoderThread,
+-                          WrapCrossThreadPersistent(this), quality));
+                          WrapCrossThreadPersistent(this), quality, shuffleAmt));
+     }
+   } else {
+     idle_task_status_ = kIdleTaskNotStarted;
+@@ -430,11 +430,11 @@ void CanvasAsyncBlobCreator::CreateNullAndReturnResult() {
+   Dispose();
+ }
+ 
+-void CanvasAsyncBlobCreator::EncodeImageOnEncoderThread(double quality) {
+void CanvasAsyncBlobCreator::EncodeImageOnEncoderThread(double quality, double shuffleAmt) {
+   DCHECK(!IsMainThread());
+   DCHECK(mime_type_ == kMimeTypeWebp);
+ 
+-  if (!EncodeImage(quality)) {
+  if (!EncodeImage(quality, shuffleAmt)) {
+     PostCrossThreadTask(
+         *parent_frame_task_runner_, FROM_HERE,
+         CrossThreadBind(&CanvasAsyncBlobCreator::CreateNullAndReturnResult,
+diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.h b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.h
+--- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.h
+++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.h
+@@ -38,7 +38,7 @@ class CORE_EXPORT CanvasAsyncBlobCreator
+                                         ExecutionContext*,
+                                         ScriptPromiseResolver*);
+ 
+-  void ScheduleAsyncBlobCreation(const double& quality);
+  void ScheduleAsyncBlobCreation(const double& quality, const double shuffleAmt);
+   virtual ~CanvasAsyncBlobCreator();
+   enum MimeType {
+     kMimeTypePng,
+@@ -130,7 +130,7 @@ class CORE_EXPORT CanvasAsyncBlobCreator
+   Member<ScriptPromiseResolver> script_promise_resolver_;
+ 
+   void LoadStaticBitmapImage();
+-  bool EncodeImage(const double&);
+  bool EncodeImage(const double&, const double);
+ 
+   // PNG, JPEG
+   bool InitializeEncoder(double quality);
+@@ -138,7 +138,7 @@ class CORE_EXPORT CanvasAsyncBlobCreator
+                                           // without deadline
+ 
+   // WEBP
+-  void EncodeImageOnEncoderThread(double quality);
+  void EncodeImageOnEncoderThread(double quality, double shuffleAmt);
+ 
+   void IdleTaskStartTimeoutEvent(double quality);
+   void IdleTaskCompleteTimeoutEvent();
+diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
+--- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
+++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
+@@ -850,7 +850,7 @@ String HTMLCanvasElement::ToDataURLInternal(
+     std::unique_ptr<ImageDataBuffer> data_buffer =
+         ImageDataBuffer::Create(image_bitmap);
+     if (data_buffer)
+-      return data_buffer->ToDataURL(encoding_mime_type, quality);
+      return data_buffer->ToDataURL(encoding_mime_type, quality, GetDocument().GetShuffleFactorX());
+   }
+   return String("data:,");
+ }
+@@ -916,7 +916,7 @@ void HTMLCanvasElement::toBlob(V8BlobCallback* callback,
+   }
+ 
+   if (async_creator) {
+-    async_creator->ScheduleAsyncBlobCreation(quality);
+    async_creator->ScheduleAsyncBlobCreation(quality, GetDocument().GetShuffleFactorX());
+   } else {
+     GetDocument()
+         .GetTaskRunner(TaskType::kCanvasBlobSerialization)
+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
+@@ -47,6 +47,10 @@ float TextMetrics::GetFontBaseline(const TextBaseline& text_baseline,
+   return 0;
+ }
+ 
+void TextMetrics::Shuffle(const double amt) {
+  //TODO: shuffle here
+}
+
+ void TextMetrics::Update(const Font& font,
+                          const TextDirection& direction,
+                          const TextBaseline& baseline,
+diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_party/blink/renderer/core/html/canvas/text_metrics.h
+--- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
+@@ -67,6 +67,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable {
+ 
+   static float GetFontBaseline(const TextBaseline&, const FontMetrics&);
+ 
+  void Shuffle(const double amt);
+
+  private:
+   void Update(const Font&,
+               const TextDirection&,
+diff --git a/third_party/blink/renderer/core/inspector/InspectorAuditsAgent.cpp b/third_party/blink/renderer/core/inspector/InspectorAuditsAgent.cpp
+--- a/third_party/blink/renderer/core/inspector/InspectorAuditsAgent.cpp
+++ b/third_party/blink/renderer/core/inspector/InspectorAuditsAgent.cpp
+@@ -56,7 +56,7 @@ bool EncodeAsImage(char* body,
+ 
+   String mime_type = "image/";
+   mime_type.append(encoding);
+-  return image_to_encode->EncodeImage(mime_type, quality, output);
+  return image_to_encode->EncodeImage(mime_type, quality, 0, output);
+ }
+ 
+ }  // namespace
+diff --git a/third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.cc b/third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.cc
+--- a/third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.cc
+++ b/third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.cc
+@@ -5,6 +5,7 @@
+ #include "third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.h"
+ 
+ #include <memory>
+#include "base/rand_util.h"
+ #include <utility>
+ 
+ #include "gpu/config/gpu_feature_info.h"
+@@ -403,7 +404,10 @@ ScriptPromise OffscreenCanvas::convertToBlob(ScriptState* script_state,
+     CanvasAsyncBlobCreator* async_creator = CanvasAsyncBlobCreator::Create(
+         snapshot, encoding_mime_type, start_time,
+         ExecutionContext::From(script_state), resolver);
+-    async_creator->ScheduleAsyncBlobCreation(options.quality());
+
+    // add +/- 3% noise against fingerprinting
+    double shuffleAmt = (base::RandDouble() - 0.5) * 0.03;
+    async_creator->ScheduleAsyncBlobCreation(options.quality(), shuffleAmt);
+     return resolver->Promise();
+   } else {
+     exception_state.ThrowDOMException(
+diff --git a/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc b/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
+--- a/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
+++ b/third_party/blink/renderer/modules/accessibility/ax_layout_object.cc
+@@ -1009,7 +1009,7 @@ String AXLayoutObject::ImageDataUrl(const IntSize& max_size) const {
+   if (!buffer)
+     return String();
+ 
+-  return buffer->ToDataURL("image/png", 1.0);
+  return buffer->ToDataURL("image/png", 1.0, document->GetShuffleFactorX());
+ }
+ 
+ String AXLayoutObject::GetText() const {
+diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+@@ -1620,6 +1620,9 @@ ImageData* BaseRenderingContext2D::getImageData(
+   const CanvasColorParams& color_params = ColorParams();
+   scoped_refptr<StaticBitmapImage> snapshot = GetImage(kPreferNoAcceleration);
+ 
+  //TODO: calculate some random value and use it to shuffle pixel data in 'snapshot'
+  // it should StaticBitmapImage somehow
+
+   if (!StaticBitmapImage::ConvertToArrayBufferContents(
+           snapshot, contents, image_data_rect, color_params, IsAccelerated())) {
+     exception_state.ThrowRangeError("Out of memory at ImageData creation");
+diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+@@ -773,8 +773,12 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
+   else
+     direction = ToTextDirection(GetState().GetDirection(), canvas());
+ 
+-  return TextMetrics::Create(font, direction, GetState().GetTextBaseline(),
+  TextMetrics* textMetrics = TextMetrics::Create(font, direction, GetState().GetTextBaseline(),
+                              GetState().GetTextAlign(), text);
+
+  textMetrics->Shuffle(canvas()->GetDocument().GetShuffleFactorX());
+
+  return textMetrics;
+ }
+ 
+ void CanvasRenderingContext2D::DrawTextInternal(
+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
+@@ -118,7 +118,9 @@ const unsigned char* ImageDataBuffer::Pixels() const {
+ 
+ bool ImageDataBuffer::EncodeImage(const String& mime_type,
+                                   const double& quality,
+                                  const double shuffleAmt,
+                                   Vector<unsigned char>* encoded_image) const {
+  //TODO: this is the only place where shuffleAmt should be used
+   DCHECK(is_valid_);
+ 
+   if (mime_type == "image/jpeg") {
+@@ -154,12 +156,12 @@ bool ImageDataBuffer::EncodeImage(const String& mime_type,
+ }
+ 
+ String ImageDataBuffer::ToDataURL(const String& mime_type,
+-                                  const double& quality) const {
+                                  const double& quality, const double shuffleAmt) const {
+   DCHECK(is_valid_);
+   DCHECK(MIMETypeRegistry::IsSupportedImageMIMETypeForEncoding(mime_type));
+ 
+   Vector<unsigned char> result;
+-  if (!EncodeImage(mime_type, quality, &result))
+  if (!EncodeImage(mime_type, quality, shuffleAmt, &result))
+     return "data:,";
+ 
+   return "data:" + mime_type + ";base64," + Base64Encode(result);
+diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.h b/third_party/blink/renderer/platform/graphics/image_data_buffer.h
+--- a/third_party/blink/renderer/platform/graphics/image_data_buffer.h
+++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.h
+@@ -47,9 +47,10 @@ class PLATFORM_EXPORT ImageDataBuffer {
+       scoped_refptr<StaticBitmapImage>);
+   static std::unique_ptr<ImageDataBuffer> Create(const SkPixmap&);
+ 
+-  String ToDataURL(const String& mime_type, const double& quality) const;
+  String ToDataURL(const String& mime_type, const double& quality, const double shuffleAmt) const;
+   bool EncodeImage(const String& mime_type,
+                    const double& quality,
+                   double shuffleAmt,
+                    Vector<unsigned char>* encoded_image) const;
+   const unsigned char* Pixels() const;
+   const IntSize& size() const { return size_; }
+-- 
+2.7.4
+
Author	SHA1	Message	Date
csagan5	b4ada5bd99	Release 67.0.3396.72	2018-06-04 20:45:57 +02:00
csagan5	cfa7aca62a	Add missing patch	2018-06-01 15:59:14 +02:00
csagan5	9eca1ff0b3	Release 67.0.3396.67	2018-06-01 15:58:52 +02:00
csagan5	aac51e0a5a	Release 66.0.3359.202	2018-05-29 20:52:06 +02:00
csagan5	ea53ed1889	Release 66.0.3359.200	2018-05-26 11:13:29 +02:00
csagan5	780bb60137	Release 66.0.3359.196	2018-05-24 09:59:15 +02:00
csagan5	0fd859a0a6	Two new patches	2018-05-20 22:07:39 +02:00
csagan5	03645239a9	Release 66.0.3359.188	2018-05-20 22:07:14 +02:00
csagan5	ec5be6c048	Release 66.0.3359.161	2018-05-08 21:51:11 +02:00
csagan5	67651fbd75	Do not use special release svg	2018-05-05 20:12:38 +02:00
csagan5	6b758bfe0c	Added patches for previous release	2018-05-05 20:11:18 +02:00
csagan5	49ae827092	Release 66.0.3359.148	2018-05-05 00:51:00 +02:00
csagan5	01ad976b53	Release 65.0.3325.230	2018-04-21 22:39:52 +02:00
csagan5	38a672a1ca	Updated CHANGELOG	2018-04-12 09:47:34 +02:00