Release 66.0.3359.188

CHANGELOG.md

@@ -1,3 +1,24 @@
+# 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 +26,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

README.md

@@ -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" />
 

patches/BRM001_Disable-third-party-cookies-by-default.patch

@@ -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(
+@@ -100,7 +100,7 @@ void CookieSettings::GetCookieSettings(
  void CookieSettings::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(

patches/BRM005_Disable-updater-pings.patch

@@ -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_;

patches/BRM006_prefs-only-keep-cookies-until-exit.patch

@@ -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!
  

patches/BRM007_Remove-EV-certificates.patch

@@ -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", ""},

patches/BRM010_Modify-default-preferences.patch

@@ -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(
+@@ -880,7 +880,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) {
+@@ -642,7 +642,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
@@ -108,7 +108,7 @@ diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.h
 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) {
+@@ -65,11 +65,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(
+@@ -215,7 +215,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) {
+@@ -370,9 +370,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 {
+@@ -330,14 +330,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
    if (is_theme())
      return false;
  

patches/BRM011_Do-not-store-passwords-by-default.patch

@@ -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(

patches/BRM012_Disable-NTP-remote-suggestions-by-default.patch

@@ -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};

patches/BRM014_Disable-WebRTC-by-default.patch

@@ -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) {
+@@ -84,10 +84,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
  #endif
  #if BUILDFLAG(ENABLE_WEBRTC)
    // TODO(guoweis): Remove next 2 options at M50.

patches/BRM016_Skip-the-first-run-and-metrics.patch

@@ -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

patches/BRM022_Fix-crash-when-accessing-page-info-site-settings.patch

@@ -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);
+@@ -623,6 +623,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);

patches/BRM023_openH264-enable-ARM-ARM64-optimizations.patch

@@ -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;
    }
  

patches/BRM024_Cure-AMP-and-tracking-from-search-results.patch

@@ -12,7 +12,7 @@ Subject: Cure AMP and tracking from search results
 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") {
+@@ -301,6 +301,7 @@ blink_core_sources("dom") {
      "events/TreeScopeEventContext.h",
      "events/WindowEventContext.cpp",
      "events/WindowEventContext.h",
@@ -31,7 +31,7 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi
  #include "platform/CrossThreadFunctional.h"
  #include "platform/DateComponents.h"
  #include "platform/EventDispatchForbiddenScope.h"
-@@ -5858,8 +5859,24 @@ void Document::FinishedParsing() {
+@@ -5804,8 +5805,24 @@ void Document::FinishedParsing() {
      fetcher_->ClearResourcesFromPreviousFetcher();
    }
  

patches/BRM025_Play-videos-in-background.patch

@@ -14,7 +14,7 @@ Original Javascript code by timdream
 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") {
+@@ -302,6 +302,7 @@ blink_core_sources("dom") {
      "events/WindowEventContext.cpp",
      "events/WindowEventContext.h",
      "extensions/dont-track-me.h",
@@ -33,7 +33,7 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi
  #include "platform/CrossThreadFunctional.h"
  #include "platform/DateComponents.h"
  #include "platform/EventDispatchForbiddenScope.h"
-@@ -5866,17 +5867,25 @@ void Document::FinishedParsing() {
+@@ -5812,17 +5813,25 @@ void Document::FinishedParsing() {
  
    // determine whether this is a Google search results page
    const SecurityOrigin *origin = GetSecurityOrigin();

patches/BRM028_ungoogled-chromium-Disable-signin.patch

@@ -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) {
+@@ -396,6 +390,7 @@ void ShowSearchEngineSettings(Browser* browser) {
  #if !defined(OS_ANDROID)
  void ShowBrowserSignin(Browser* browser,
                         signin_metrics::AccessPoint access_point) {
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.
    Profile* original_profile = browser->profile()->GetOriginalProfile();
    SigninManagerBase* manager =
        SigninManagerFactory::GetForProfile(original_profile);
-@@ -426,6 +421,7 @@ void ShowBrowserSignin(Browser* browser,
+@@ -436,6 +431,7 @@ void ShowBrowserSignin(Browser* browser,
              false));
      DCHECK_GT(browser->tab_strip_model()->count(), 0);
    }

patches/BRM029_ungoogled-chromium-Disable-webRTC-log-uploader.patch

@@ -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
 

patches/BRM030_ungoogled-chromium-Disable-untraceable-URLs.patch

@@ -28,7 +28,7 @@ diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/and
 diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc
 --- a/chrome/browser/plugins/plugins_resource_service.cc
 +++ b/chrome/browser/plugins/plugins_resource_service.cc
-@@ -51,9 +51,6 @@ const int kStartResourceFetchDelayMs = 60 * 1000;
+@@ -52,9 +52,6 @@ const int kStartResourceFetchDelayMs = 60 * 1000;
  // Delay between calls to update the cache 1 day and 2 minutes in testing mode.
  const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
  
@@ -38,7 +38,7 @@ diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser
  GURL GetPluginsServerURL() {
    std::string filename;
  #if defined(OS_WIN)
-@@ -68,7 +65,7 @@ GURL GetPluginsServerURL() {
+@@ -69,7 +66,7 @@ GURL GetPluginsServerURL() {
  #error Unknown platform
  #endif
  

patches/BRM034_ungoogled-chromium-Disable-Google-host-detection.patch

@@ -14,7 +14,7 @@ Disables various detections of Google hosts and functionality specific to them
 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,7 +324,7 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
 diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
 --- a/components/search_engines/template_url.cc
 +++ b/components/search_engines/template_url.cc
-@@ -455,11 +455,6 @@ base::string16 TemplateURLRef::SearchTermToString16(
+@@ -510,11 +510,6 @@ base::string16 TemplateURLRef::SearchTermToString16(
  bool TemplateURLRef::HasGoogleBaseURLs(
      const SearchTermsData& search_terms_data) const {
    ParseIfNecessary(search_terms_data);

patches/BRM035_ungoogled-chromium-Disable-GCM.patch

@@ -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() {

patches/BRM036_ungoogled-chromium-Disable-Gaia.patch

@@ -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 @@
+@@ -299,7 +299,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 @@
+@@ -435,7 +434,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" />

patches/BRM037_ungoogled-chromium-Clear-HTTP-cache-menu-item.patch

@@ -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 @@
+@@ -150,6 +150,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.
+@@ -1050,6 +1050,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.
+@@ -1088,6 +1091,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,7 +53,7 @@ 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 @@
+@@ -59,6 +59,9 @@
  #include "extensions/browser/extension_system.h"
  #include "printing/features/features.h"
  #include "ui/events/keycodes/keyboard_codes.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(
+@@ -624,6 +627,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() {
+@@ -865,6 +871,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.-->
+@@ -47004,6 +47004,7 @@ Called by update_traffic_annotation_histograms.py.-->
    <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.
+@@ -104632,6 +104632,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."/>

patches/BRM038_url_request-hooks-and-ad-url-data.patch

@@ -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") {
+@@ -1748,6 +1748,8 @@ component("net") {
        "url_request/url_fetcher_response_writer.h",
        "url_request/url_range_request_job.cc",
        "url_request/url_range_request_job.h",
@@ -166,15 +166,15 @@ new file mode 100644
 diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 --- a/net/url_request/url_request.cc
 +++ b/net/url_request/url_request.cc
-@@ -44,6 +44,8 @@
+@@ -43,6 +43,8 @@
  #include "url/gurl.h"
  #include "url/origin.h"
  
 +#include "net/url_request/nochromo_intercept.h"
 +
  #if BUILDFLAG(ENABLE_REPORTING)
- #include "net/url_request/network_error_logging_delegate.h"
- #endif  // BUILDFLAG(ENABLE_REPORTING)
+ #include "net/network_error_logging/network_error_logging_service.h"
+ #include "net/reporting/reporting_service.h"
 @@ -581,6 +583,8 @@ URLRequest::URLRequest(const GURL& url,
    // Sanity check out environment.
    DCHECK(base::ThreadTaskRunnerHandle::IsSet());

patches/BRM039_Bromite-adblock-engine.patch

@@ -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") {
+@@ -1748,8 +1748,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") {
+@@ -1810,6 +1808,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
@@ -538,7 +538,7 @@ deleted file mode 100644
 diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 --- a/net/url_request/url_request.cc
 +++ b/net/url_request/url_request.cc
-@@ -44,7 +44,9 @@
+@@ -43,7 +43,9 @@
  #include "url/gurl.h"
  #include "url/origin.h"
  
@@ -548,7 +548,7 @@ 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"
+ #include "net/network_error_logging/network_error_logging_service.h"
 @@ -558,7 +560,9 @@ URLRequest::URLRequest(const GURL& url,
                                           : context->network_delegate()),
        net_log_(NetLogWithSource::Make(context->net_log(),

patches/BRM042_Disable-plugins-enumeration.patch

@@ -9,7 +9,7 @@ Subject: Disable plugins enumeration
 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() {
+@@ -1134,10 +1134,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
  }
  
  PluginData* LocalFrame::GetPluginData() const {

patches/BRM043_AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch

@@ -43,7 +43,7 @@ diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl b/third_
 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() {
+@@ -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
 

patches/BRM044_Add-menu-option-to-toggle-global-Javascript-preference.patch

@@ -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
+@@ -2006,6 +2006,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
+@@ -1796,6 +1796,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 {
+@@ -213,6 +213,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 {
+@@ -468,4 +470,37 @@ public class AppMenuPropertiesDelegate {
  
          return chromeHomeMenuItemFlagEnabled && !sHideChromeHomeMenuItems;
      }
@@ -158,7 +158,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
+@@ -2491,6 +2491,17 @@ To obtain new licenses, connect to the internet and play your downloaded content
        <message name="IDS_MENU_FIND_IN_PAGE" desc="Menu item allowing users to find text within the current page. [CHAR-LIMIT=27]">
          Find in page
        </message>

patches/BRM045_Remove-google-account-access-permission-on-reboot.patch

@@ -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
+@@ -726,8 +726,7 @@ android_assets("chrome_public_locale_pak_assets") {
+ jinja_template_resources("chrome_public_apk_template_resources") {
+   resources = [
+     "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
+@@ -822,14 +822,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
+

patches/BRM046_Punt-the-Widevine-version-string.patch

@@ -0,0 +1,36 @@
+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 | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+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
+@@ -238,10 +238,7 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
+     info.is_out_of_process = true;
+     info.path = adapter_path;
+     info.name = kWidevineCdmDisplayName;
+-    info.description =
+-        base::StringPrintf("%s (version: " WIDEVINE_CDM_VERSION_STRING ")",
+-                           kWidevineCdmDescription);
+-    info.version = WIDEVINE_CDM_VERSION_STRING;
++    info.description = kWidevineCdmDescription;
+     info.permissions = kWidevineCdmPluginPermissions;
+ 
+     content::WebPluginMimeType mime_type(kWidevineCdmPluginMimeType,
+@@ -566,7 +563,7 @@ void ChromeContentClient::AddContentDecryptionModules(
+       // CdmInfo needs |path| to be the actual Widevine library,
+       // not the adapter, so adjust as necessary. It will be in the
+       // same directory as the installed adapter.
+-      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
+

patches/BRM047_Disable-metrics-on-all-I-O-threads.patch

@@ -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
+@@ -971,7 +971,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
+

patches/BRM048_Enable-DNS-over-HTTPS-by-default.patch

@@ -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
+

patches/BRM049_Add-fingerprinting-mitigation-for-getClientRects-getBoundingClientRect.patch

@@ -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,
@@ -22,27 +22,27 @@ See also: http://www.gsd.inesc-id.pt/~mpc/pubs/fingerprinting-trustcom2016.pdf
 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 @@
+@@ -272,6 +272,8 @@
  #include "services/service_manager/public/cpp/interface_provider.h"
- #include "third_party/WebKit/common/page/page_visibility_state.mojom-blink.h"
+ #include "third_party/WebKit/public/mojom/page/page_visibility_state.mojom-blink.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,
+@@ -731,6 +733,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,
+@@ -757,6 +763,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope,
                         Position::BeforeNode(*shadow_host));
  }
  
@@ -60,9 +60,9 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKi
 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,
+@@ -406,6 +406,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,
+@@ -1663,6 +1666,8 @@ class CORE_EXPORT Document : public ContainerNode,
  
    double start_time_;
  
@@ -82,7 +82,7 @@ diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/
 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() {
+@@ -1327,6 +1327,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() {
+@@ -1344,6 +1349,8 @@ DOMRect* Element::getBoundingClientRect() {
    DCHECK(element_layout_object);
    GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
                                                          *element_layout_object);

patches/BRM050_Disable-custom-tab-activities-permanently.patch

@@ -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
+

patches/BRM051_Canvas-fingerprinting-mitigations-via-IDL.patch

@@ -12,7 +12,7 @@ Disable toDataURL, toBlob, getImageData and webGL renderering info
 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
+@@ -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.