Release 64.0.3282.204

CHANGELOG.md

@@ -1,5 +1,12 @@
+# 64.0.3282.204
+* use H264 NEON optimizations also for arm64
+* fix build of Stable channel
+* updated AdBlock filters
+* started building vanilla Chromium releases as well
+
 # 64.0.3282.193
 * updated AdBlock filters
+* disable reporting
 
 # 64.0.3282.182
 * add support for domain-based adblock filters

patches/BRM002_restore-classic-new-tab-page.patch

@@ -6,7 +6,7 @@ Date:   Sun Nov 26 11:40:05 2017 +0100
 diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
 --- a/chrome/browser/search/search.cc
 +++ b/chrome/browser/search/search.cc
-@@ -155,10 +155,7 @@ bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) {
+@@ -115,10 +115,7 @@ bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) {
  }
  
  bool ShouldShowLocalNewTab(Profile* profile) {

patches/BRM005_disable-updater-pings.patch

@@ -17,8 +17,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.
-@@ -86,8 +88,7 @@ ConfiguratorImpl::ConfiguratorImpl(const base::CommandLine* cmdline,
-     : fast_update_(false),
+@@ -89,8 +91,7 @@ ConfiguratorImpl::ConfiguratorImpl(
+       fast_update_(false),
        pings_enabled_(false),
        deltas_enabled_(false),
 -      background_downloads_enabled_(false),
@@ -27,7 +27,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), ",",
-@@ -135,22 +136,6 @@ int ConfiguratorImpl::UpdateDelay() const {
+@@ -138,22 +139,6 @@ int ConfiguratorImpl::UpdateDelay() const {
  
  std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
    std::vector<GURL> urls;
@@ -53,7 +53,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
-@@ -89,7 +89,6 @@ class ConfiguratorImpl {
+@@ -98,7 +98,6 @@ class ConfiguratorImpl {
    bool pings_enabled_;
    bool deltas_enabled_;
    bool background_downloads_enabled_;

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

@@ -1,7 +1,7 @@
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Wed Oct 11 23:19:25 2017 +0200
 
-    Subject: [PATCH 21/60] prefs: only keep cookies until exit
+    [PATCH 21/60] prefs: only keep cookies until exit
     From: Jan Engelhardt <jengelh@inai.de>
     Date: Sat, 13 Sep 2014 17:25:47 +0200
     
@@ -10,7 +10,7 @@ Date:   Wed Oct 11 23:19:25 2017 +0200
 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
-@@ -117,7 +117,7 @@ void ContentSettingsRegistry::Init() {
+@@ -118,7 +118,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/BRM009_disables-omission-of-url-elements-in-omnibox.patch

@@ -8,24 +8,22 @@ Date:   Wed Oct 11 23:24:58 2017 +0200
 diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -401,13 +401,13 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
- 
+@@ -402,12 +402,12 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
  }  // namespace
  
--const FormatUrlType kFormatUrlOmitNothing = 0;
+ const FormatUrlType kFormatUrlOmitNothing = 0;
 -const FormatUrlType kFormatUrlOmitUsernamePassword = 1 << 0;
 -const FormatUrlType kFormatUrlOmitHTTP = 1 << 1;
 -const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2;
 -const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
 -const FormatUrlType kFormatUrlExperimentalElideAfterHost = 1 << 4;
--const FormatUrlType kFormatUrlOmitTrivialSubdomains = 1 << 5;
-+const FormatUrlType kFormatUrlOmitNothing = 1;
+-const FormatUrlType kFormatUrlExperimentalOmitTrivialSubdomains = 1 << 5;
 +const FormatUrlType kFormatUrlOmitUsernamePassword = 0 << 0;
 +const FormatUrlType kFormatUrlOmitHTTP = 0 << 1;
 +const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0 << 2;
 +const FormatUrlType kFormatUrlOmitHTTPS = 0 << 3;
 +const FormatUrlType kFormatUrlExperimentalElideAfterHost = 0 << 4;
-+const FormatUrlType kFormatUrlOmitTrivialSubdomains = 0 << 5;
++const FormatUrlType kFormatUrlExperimentalOmitTrivialSubdomains = 0 << 5;
  
  const FormatUrlType kFormatUrlOmitDefaults =
      kFormatUrlOmitUsernamePassword | kFormatUrlOmitHTTP |

patches/BRM010_modify-default-preferences.patch

@@ -18,27 +18,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
-@@ -882,7 +882,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -878,7 +878,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
-@@ -644,7 +644,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -612,7 +612,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
@@ -66,7 +66,7 @@ diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/predic
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -138,7 +138,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN";
+@@ -136,7 +136,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN";
  void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kSearchSuggestEnabled,
@@ -90,7 +90,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
-@@ -384,8 +384,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
+@@ -391,8 +391,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
  void RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
@@ -99,12 +99,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
-@@ -65,11 +65,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -59,11 +59,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
    registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
    registry->RegisterBooleanPref(
@@ -133,7 +133,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,
@@ -159,7 +159,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(
+@@ -217,7 +217,7 @@ void AutofillManager::RegisterProfilePrefs(
    registry->RegisterIntegerPref(
        prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
    registry->RegisterBooleanPref(
@@ -189,7 +189,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
-@@ -346,9 +346,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -334,9 +334,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(
        prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
    registry->RegisterBooleanPref(
@@ -204,7 +204,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
-@@ -330,14 +330,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
+@@ -344,14 +344,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
    if (is_theme())
      return false;
  

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

@@ -6,7 +6,7 @@ Date:   Wed Oct 11 23:17:17 2017 +0200
 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
-@@ -244,10 +244,10 @@ PasswordFormManager* FindMatchedManager(
+@@ -235,10 +235,10 @@ PasswordFormManager* FindMatchedManager(
  void PasswordManager::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(

patches/BRM012_disable-ntp-remote-suggestions-by-default.patch

@@ -6,8 +6,8 @@ Date:   Thu Oct 12 08:15:17 2017 +0200
 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
-@@ -41,16 +41,16 @@ const base::Feature kArticleSuggestionsExpandableHeader{
-     "NTPArticleSuggestionsExpandableHeader", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -38,16 +38,16 @@ const base::Feature* const kAllFeatures[] = {
+     nullptr};
  
  const base::Feature kArticleSuggestionsFeature{
 -    "NTPArticleSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};

patches/BRM014_disable-webrtc-by-default.patch

@@ -6,7 +6,7 @@ Date:   Thu Oct 26 16:59:03 2017 +0200
 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
-@@ -84,10 +84,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -78,10 +78,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
  #endif
  #if BUILDFLAG(ENABLE_WEBRTC)
    // TODO(guoweis): Remove next 2 options at M50.

patches/BRM015_ported-data-reduction-disable-patch.patch

@@ -6,12 +6,11 @@ Date:   Fri Oct 27 15:53:37 2017 +0200
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
-@@ -140,7 +140,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -146,7 +146,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
          boolean notifyAdapter = false;
          // An optional Data Saver page.
          if (mFreProperties.getBoolean(SHOW_DATA_REDUCTION_PAGE)) {
--            mPages.add(new DataReductionProxyFirstRunFragment.Page());
-+            //mPages.add(new DataReductionProxyFirstRunFragment.Page());
+-            mPages.add(pageOf(DataReductionProxyFirstRunFragment.class));
              mFreProgressStates.add(FRE_PROGRESS_DATA_SAVER_SHOWN);
              notifyAdapter = true;
          }

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

@@ -6,22 +6,27 @@ Date:   Sun Nov 26 22:51:43 2017 +0100
 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,11 +36,11 @@ public class FirstRunStatus {
+@@ -34,8 +34,12 @@ public class FirstRunStatus {
       * includes ToS and Sign In pages if necessary.
       */
      public static boolean getFirstRunFlowComplete() {
--        if (ContextUtils.getAppSharedPreferences().getBoolean(FIRST_RUN_FLOW_COMPLETE, false)) {
--            return true;
-+        boolean complete = ContextUtils.getAppSharedPreferences().getBoolean(FIRST_RUN_FLOW_COMPLETE, false);
+-        return ContextUtils.getAppSharedPreferences()
++        boolean complete = ContextUtils.getAppSharedPreferences()
+                 .getBoolean(FIRST_RUN_FLOW_COMPLETE, false);
 +        if (!complete) {
 +             setFirstRunFlowComplete(true);
-         }
--        return CommandLine.getInstance().hasSwitch(
--                ChromeSwitches.FORCE_FIRST_RUN_FLOW_COMPLETE_FOR_TESTING);
++        }
 +        return true;
      }
  
      /**
+@@ -71,4 +75,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
@@ -51,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
+@@ -60,20 +60,14 @@ public class ToSAndUMAFirstRunFragment extends FirstRunPage {
              }
          });
  

patches/BRM017_always-disable-omaha-update-checks.patch

@@ -6,7 +6,7 @@ Date:   Sun Nov 26 23:11:56 2017 +0100
 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 {
+@@ -121,7 +121,7 @@ public class OmahaBase {
  
      /** See {@link #sIsDisabled}. */
      static boolean isDisabled() {

patches/BRM018_add-duckduckgo-search-engine-not-enabled-by-default.patch

@@ -10,8 +10,8 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
  
      // Increment this if you change the data in ways that mean users with
      // existing data should get a new version.
--    "kCurrentDataVersion": 100
-+    "kCurrentDataVersion": 101
+-    "kCurrentDataVersion": 99
++    "kCurrentDataVersion": 100
    },
  
    // The following engines are included in country lists and are added to the
@@ -54,7 +54,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -51,548 +51,548 @@ namespace {
+@@ -50,548 +50,548 @@ namespace {
  
  // Default (for countries with no better engine set)
  const PrepopulatedEngine* const engines_default[] = {

patches/BRM019_add-startpage-search-engine.patch

@@ -10,12 +10,12 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
  
      // Increment this if you change the data in ways that mean users with
      // existing data should get a new version.
--    "kCurrentDataVersion": 101
-+    "kCurrentDataVersion": 102
+-    "kCurrentDataVersion": 100
++    "kCurrentDataVersion": 101
    },
  
    // The following engines are included in country lists and are added to the
-@@ -232,6 +232,16 @@
+@@ -228,6 +228,16 @@
        "id": 56
      },
  
@@ -46,7 +46,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -51,548 +51,548 @@ namespace {
+@@ -50,548 +50,548 @@ namespace {
  
  // Default (for countries with no better engine set)
  const PrepopulatedEngine* const engines_default[] = {

patches/BRM020_added-google-english-only-engine-no-rlz-and-field-experiments.patch

@@ -10,12 +10,12 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
  
      // Increment this if you change the data in ways that mean users with
      // existing data should get a new version.
--    "kCurrentDataVersion": 102
-+    "kCurrentDataVersion": 103
+-    "kCurrentDataVersion": 101
++    "kCurrentDataVersion": 102
    },
  
    // The following engines are included in country lists and are added to the
-@@ -154,6 +154,27 @@
+@@ -150,6 +150,27 @@
        "id": 1
      },
  
@@ -57,7 +57,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -51,548 +51,548 @@ namespace {
+@@ -50,548 +50,548 @@ namespace {
  
  // Default (for countries with no better engine set)
  const PrepopulatedEngine* const engines_default[] = {

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

@@ -6,7 +6,7 @@ Date:   Sat Jan 20 19:44:43 2018 +0100
 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
-@@ -573,6 +573,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
+@@ -601,6 +601,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
      const GURL& embedding_origin) {
    GURL canonical_requesting_origin = GetCanonicalOrigin(requesting_origin);
    PermissionContextBase* context = GetPermissionContext(permission);

patches/BRM021_revert-remove-runtime-flags-for-deep-and-shadow-used-in-css-dynamic-profile.patch

@@ -1,114 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Dec 20 22:18:41 2017 +0100
-
-    Revert "Remove Runtime flags for /deep/ and ::shadow used in CSS dynamic profile"
-    
-    This reverts commit 860f43550bf6587ca21900dfdf901fce697cbbb7
-
-diff --git a/third_party/WebKit/Source/core/css/CSSSelector.cpp b/third_party/WebKit/Source/core/css/CSSSelector.cpp
---- a/third_party/WebKit/Source/core/css/CSSSelector.cpp
-+++ b/third_party/WebKit/Source/core/css/CSSSelector.cpp
-@@ -546,8 +546,14 @@ void CSSSelector::UpdatePseudoType(const AtomicString& value,
-         pseudo_type_ = kPseudoUnknown;
-       break;
-     case kPseudoShadow:
--      if (match_ != kPseudoElement || context.IsDynamicProfile())
--        pseudo_type_ = kPseudoUnknown;
-+      if (RuntimeEnabledFeatures::
-+              ShadowPseudoElementInCSSDynamicProfileEnabled()) {
-+        if (match_ != kPseudoElement)
-+          pseudo_type_ = kPseudoUnknown;
-+      } else {
-+        if (match_ != kPseudoElement || context.IsDynamicProfile())
-+          pseudo_type_ = kPseudoUnknown;
-+      }
-       break;
-     case kPseudoBlinkInternalElement:
-       if (match_ != kPseudoElement || mode != kUASheetMode)
-diff --git a/third_party/WebKit/Source/core/css/SelectorChecker.cpp b/third_party/WebKit/Source/core/css/SelectorChecker.cpp
---- a/third_party/WebKit/Source/core/css/SelectorChecker.cpp
-+++ b/third_party/WebKit/Source/core/css/SelectorChecker.cpp
-@@ -336,6 +336,8 @@ SelectorChecker::MatchStatus SelectorChecker::MatchForRelation(
- 
-   switch (relation) {
-     case CSSSelector::kShadowDeepAsDescendant:
-+      DCHECK(
-+          !RuntimeEnabledFeatures::DeepCombinatorInCSSDynamicProfileEnabled());
-       Deprecation::CountDeprecation(context.element->GetDocument(),
-                                     WebFeature::kCSSDeepCombinator);
-       FALLTHROUGH;
-@@ -424,6 +426,11 @@ SelectorChecker::MatchStatus SelectorChecker::MatchForRelation(
-         UseCounter::Count(context.element->GetDocument(),
-                           WebFeature::kPseudoShadowInStaticProfile);
-       }
-+      if (RuntimeEnabledFeatures::
-+                       ShadowPseudoElementInCSSDynamicProfileEnabled()) {
-+          Deprecation::CountDeprecation(context.element->GetDocument(),
-+                                        WebFeature::kCSSSelectorPseudoShadow);
-+      }
-       // If we're in the same tree-scope as the scoping element, then following
-       // a shadow descendant combinator would escape that and thus the scope.
-       if (context.scope && context.scope->OwnerShadowHost() &&
-diff --git a/third_party/WebKit/Source/core/css/StyleEngineTest.cpp b/third_party/WebKit/Source/core/css/StyleEngineTest.cpp
---- a/third_party/WebKit/Source/core/css/StyleEngineTest.cpp
-+++ b/third_party/WebKit/Source/core/css/StyleEngineTest.cpp
-@@ -842,6 +842,14 @@ TEST_F(StyleEngineTest, RuleSetInvalidationV0BoundaryCrossing) {
-   EXPECT_EQ(ScheduleInvalidationsForRules(
-                 *shadow_root, ".a ::content span { background: green}"),
-             kRuleSetInvalidationFullRecalc);
-+  if (RuntimeEnabledFeatures::DeepCombinatorInCSSDynamicProfileEnabled()) {
-+    EXPECT_EQ(ScheduleInvalidationsForRules(
-+                  *shadow_root, ".a /deep/ span { background: green}"),
-+              kRuleSetInvalidationFullRecalc);
-+    EXPECT_EQ(ScheduleInvalidationsForRules(
-+                  *shadow_root, ".a::shadow span { background: green}"),
-+              kRuleSetInvalidationFullRecalc);
-+  }
- }
- 
- TEST_F(StyleEngineTest, HasViewportDependentMediaQueries) {
-diff --git a/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp
---- a/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp
-+++ b/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp
-@@ -1,4 +1,3 @@
--
- // Copyright 2014 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-@@ -667,6 +666,9 @@ CSSSelector::RelationType CSSSelectorParser::ConsumeCombinator(
-       const CSSParserToken& slash = range.ConsumeIncludingWhitespace();
-       if (slash.GetType() != kDelimiterToken || slash.Delimiter() != '/')
-         failed_parsing_ = true;
-+      if (RuntimeEnabledFeatures::DeepCombinatorInCSSDynamicProfileEnabled()) {
-+        return CSSSelector::kShadowDeep;
-+      }
-       return context_->IsDynamicProfile() ? CSSSelector::kShadowDeepAsDescendant
-                                           : CSSSelector::kShadowDeep;
-     }
-diff --git a/third_party/WebKit/Source/platform/runtime_enabled_features.json5 b/third_party/WebKit/Source/platform/runtime_enabled_features.json5
---- a/third_party/WebKit/Source/platform/runtime_enabled_features.json5
-+++ b/third_party/WebKit/Source/platform/runtime_enabled_features.json5
-@@ -325,6 +325,11 @@
-       name: "DecodeToYUV",
-       status: "experimental",
-     },
-+    // Remove this flag once we can remove /deep/ at M63.
-+    {
-+      name: "DeepCombinatorInCSSDynamicProfile",
-+      status: "test",
-+    },
-     {
-       name: "DeprecationReporting",
-       status: "experimental",
-@@ -980,6 +985,11 @@
-       name: "ShadowPiercingDescendantCombinator",
-       status: "experimental",
-     },
-+    // Remove this flag once we can remove ::shadow at M63.
-+    {
-+      name: "ShadowPseudoElementInCSSDynamicProfile",
-+      status: "test",
-+    },
-     {
-       name: "ShapeDetection",
-       status: "experimental",

patches/BRM022_compile-with-arm-arm64-optimizations-for-h264.patch

@@ -0,0 +1,91 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Sat Jan 20 21:17:27 2018 +0100
+
+    Compile with ARM/ARM64 optimizations for H264
+    Not only when running ChromeOS but for all compatbile devices
+
+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
+@@ -145,8 +145,12 @@ void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) {
+     init_params.iRCMode = RC_OFF_MODE;
+   }
+ 
++#if defined(OS_MACOSX)
+   // Threading model: Set to 1 due to https://crbug.com/583348.
+   init_params.iMultipleThreadIdc = 1;
++#else
++  init_params.iMultipleThreadIdc = 0;
++#endif
+ 
+   // TODO(mcasas): consider reducing complexity if there are few CPUs available.
+   init_params.iComplexityMode = MEDIUM_COMPLEXITY;
+diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
+--- a/third_party/openh264/BUILD.gn
++++ b/third_party/openh264/BUILD.gn
+@@ -12,6 +12,20 @@ config("config") {
+   cflags = []
+   defines = []
+ 
++  # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS
++  # devices.
++  if (is_chromeos && target_cpu == "arm") {
++    defines += [
++      "__chromeos__",
++    ]
++  }
++
++  if (target_cpu == "arm" || target_cpu == "arm64") {
++    defines += [
++      "HAVE_NEON",
++    ]
++  }
++
+   # GCC and clang flags. MSVS (is_win && !is_clang) does not use cflags.
+   if (!is_win || is_clang) {
+     cflags += [
+@@ -105,6 +119,14 @@ source_set("common") {
+   sources = openh264_common_sources
+   include_dirs = openh264_common_include_dirs
+ 
++  # enable ARM optimizations
++  if (target_cpu == "arm") {
++    sources += openh264_common_sources_asm_arm
++  }
++  if (target_cpu == "arm64") {
++    sources += openh264_common_sources_asm_arm64
++  }
++
+   configs -= [ "//build/config/compiler:chromium_code" ]
+   configs += [ "//build/config/compiler:no_chromium_code" ]
+   configs += [ ":config" ]
+@@ -128,6 +150,14 @@ source_set("processing") {
+   sources = openh264_processing_sources
+   include_dirs = openh264_processing_include_dirs
+ 
++  # enable ARM optimizations
++  if (target_cpu == "arm") {
++    sources += openh264_common_sources_asm_arm
++  }
++  if (target_cpu == "arm64") {
++    sources += openh264_common_sources_asm_arm64
++  }
++
+   configs -= [ "//build/config/compiler:chromium_code" ]
+   configs += [ "//build/config/compiler:no_chromium_code" ]
+   configs += [ ":config" ]
+@@ -144,6 +174,14 @@ source_set("encoder") {
+   sources = openh264_encoder_sources
+   include_dirs = openh264_encoder_include_dirs
+ 
++  # enable ARM optimizations
++  if (target_cpu == "arm") {
++    sources += openh264_common_sources_asm_arm
++  }
++  if (target_cpu == "arm64") {
++    sources += openh264_common_sources_asm_arm64
++  }
++
+   configs -= [ "//build/config/compiler:chromium_code" ]
+   configs += [ "//build/config/compiler:no_chromium_code" ]
+   configs += [ ":config" ]

patches/BRM022_revert-disable-runtime-flags-for-deep-and-shadow-used-in-css-dynamic-profile-for-m63.patch

@@ -1,71 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Dec 20 22:31:37 2017 +0100
-
-    Revert "Disable runtime flags for /deep/ and ::shadow used in CSS dynamic profile for M63."
-    
-    This reverts commit 0ebd56da93abf970128804390879624b3dc79ac2.
-
-diff --git a/third_party/WebKit/LayoutTests/fast/dom/shadow/apply-deep-in-document-scope-expected.txt b/third_party/WebKit/LayoutTests/fast/dom/shadow/apply-deep-in-document-scope-expected.txt
---- a/third_party/WebKit/LayoutTests/fast/dom/shadow/apply-deep-in-document-scope-expected.txt
-+++ b/third_party/WebKit/LayoutTests/fast/dom/shadow/apply-deep-in-document-scope-expected.txt
-@@ -1,4 +1,4 @@
--CONSOLE WARNING: line 1: /deep/ combinator is no longer supported in CSS dynamic profile.It is now effectively no-op, acting as if it were a descendant combinator. /deep/ combinator will be removed, and will be invalid at M65. You should remove it. See https://www.chromestatus.com/features/4964279606312960 for more details.
-+CONSOLE WARNING: line 1: /deep/ combinator in CSS is deprecated and will be removed in M63, around December 2017. See https://www.chromestatus.com/features/4964279606312960 for more details.
- /deep/ as a descendant selector in document without shadow trees.
- 
- On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-diff --git a/third_party/WebKit/Source/core/frame/Deprecation.cpp b/third_party/WebKit/Source/core/frame/Deprecation.cpp
---- a/third_party/WebKit/Source/core/frame/Deprecation.cpp
-+++ b/third_party/WebKit/Source/core/frame/Deprecation.cpp
-@@ -388,13 +388,13 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) {
-               "details.")};
- 
-     case WebFeature::kCSSDeepCombinator:
--      return {"CSSDeepCombinator", M65,
--              "/deep/ combinator is no longer supported in CSS dynamic profile."
--              "It is now effectively no-op, acting as if it were a descendant "
--              "combinator. /deep/ combinator will be removed, and will be "
--              "invalid at M65. You should remove it. See "
--              "https://www.chromestatus.com/features/4964279606312960 for more "
--              "details."};
-+      return {"CSSDeepCombinator", M63,
-+              willBeRemoved("/deep/ combinator in CSS", M63, "4964279606312960")};
-+
-+    case WebFeature::kCSSSelectorPseudoShadow:
-+      return {"CSSSelectorPseudoShadow", M63,
-+              willBeRemoved("::shadow pseudo-element in CSS", M63,
-+                           "6750456638341120")};
- 
-     case WebFeature::kVREyeParametersOffset:
-       return {"VREyeParametersOffset", Unknown,
-diff --git a/third_party/WebKit/Source/platform/runtime_enabled_features.json5 b/third_party/WebKit/Source/platform/runtime_enabled_features.json5
---- a/third_party/WebKit/Source/platform/runtime_enabled_features.json5
-+++ b/third_party/WebKit/Source/platform/runtime_enabled_features.json5
-@@ -325,10 +325,11 @@
-       name: "DecodeToYUV",
-       status: "experimental",
-     },
--    // Remove this flag once we can remove /deep/ at M63.
-+    // Introduced this flag as stable so we can re-enable this feature easily
-+    // after we disable this feature.
-     {
-       name: "DeepCombinatorInCSSDynamicProfile",
--      status: "test",
-+      status: "stable",
-     },
-     {
-       name: "DeprecationReporting",
-@@ -985,10 +986,11 @@
-       name: "ShadowPiercingDescendantCombinator",
-       status: "experimental",
-     },
--    // Remove this flag once we can remove ::shadow at M63.
-+    // Introduced this flag as stable so we can re-enable this feature easily
-+    // after we disable this feature.
-     {
-       name: "ShadowPseudoElementInCSSDynamicProfile",
--      status: "test",
-+      status: "stable",
-     },
-     {
-       name: "ShapeDetection",

patches/BRM023_do-not-track-google-search-results-clicks.patch

@@ -8,7 +8,7 @@ Date:   Sat Oct 28 10:09:41 2017 +0200
 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
-@@ -301,6 +301,7 @@ blink_core_sources("dom") {
+@@ -346,6 +346,7 @@ blink_core_sources("dom") {
      "events/TreeScopeEventContext.h",
      "events/WindowEventContext.cpp",
      "events/WindowEventContext.h",
@@ -19,7 +19,7 @@ diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/So
 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
-@@ -221,6 +221,7 @@
+@@ -219,6 +219,7 @@
  #include "core/xml/parser/XMLDocumentParser.h"
  #include "core/xml_names.h"
  #include "core/xmlns_names.h"
@@ -27,7 +27,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"
-@@ -5789,8 +5790,24 @@ void Document::FinishedParsing() {
+@@ -5809,8 +5810,24 @@ void Document::FinishedParsing() {
      fetcher_->ClearResourcesFromPreviousFetcher();
    }
  

patches/BRM024_compile-arm-optimizations-for-h264.patch

@@ -1,81 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sat Jan 20 21:17:27 2018 +0100
-
-    Compile ARM optimizations for H264
-    Not only when running ChromeOS+ARM but for all ARM devices
-
-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
-@@ -149,11 +149,11 @@ void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) {
-     init_params.iRCMode = RC_OFF_MODE;
-   }
- 
--#if defined(OS_CHROMEOS)
--  init_params.iMultipleThreadIdc = 0;
--#else
-+#if defined(OS_MACOSX)
-   // Threading model: Set to 1 due to https://crbug.com/583348.
-   init_params.iMultipleThreadIdc = 1;
-+#else
-+  init_params.iMultipleThreadIdc = 0;
- #endif
- 
-   // TODO(mcasas): consider reducing complexity if there are few CPUs available.
-diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
---- a/third_party/openh264/BUILD.gn
-+++ b/third_party/openh264/BUILD.gn
-@@ -10,16 +10,22 @@ import("//third_party/yasm/yasm_assemble.gni")
- # Config shared by all openh264 targets.
- config("config") {
-   cflags = []
-+  defines = []
- 
-+  # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS
-+  # devices.
-   if (is_chromeos && target_cpu == "arm") {
--    # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS
--    # devices.
--    defines = [
--      "HAVE_NEON",
-+    defines += [
-       "__chromeos__",
-     ]
-   }
- 
-+  if (target_cpu == "arm") {
-+    defines += [
-+      "HAVE_NEON",
-+    ]
-+  }
-+
-   # GCC and clang flags. MSVS (is_win && !is_clang) does not use cflags.
-   if (!is_win || is_clang) {
-     cflags += [
-@@ -123,7 +129,7 @@ if (use_assembler) {
- 
- source_set("common") {
-   sources = openh264_common_sources
--  if (is_chromeos && target_cpu == "arm") {
-+  if (target_cpu == "arm") {
-     sources += openh264_common_sources_asm_arm
-   }
-   include_dirs = openh264_common_include_dirs
-@@ -149,7 +155,7 @@ source_set("common") {
- 
- source_set("processing") {
-   sources = openh264_processing_sources
--  if (is_chromeos && target_cpu == "arm") {
-+  if (target_cpu == "arm") {
-     sources += openh264_processing_sources_asm_arm
-   }
-   include_dirs = openh264_processing_include_dirs
-@@ -168,7 +174,7 @@ source_set("processing") {
- 
- source_set("encoder") {
-   sources = openh264_encoder_sources
--  if (is_chromeos && target_cpu == "arm") {
-+  if (target_cpu == "arm") {
-     sources += openh264_encoder_sources_asm_arm
-   }
-   include_dirs = openh264_encoder_include_dirs

patches/BRM026_ungoogled-chromium-disable-signin.patch

@@ -6,7 +6,7 @@ Date:   Mon Feb 12 21:14:39 2018 +0100
 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) {
+@@ -74,12 +74,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) {
    ShowSingletonTabOverwritingNTP(browser, params);
  }
  
@@ -19,7 +19,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
-@@ -396,6 +390,7 @@ void ShowSearchEngineSettings(Browser* browser) {
+@@ -384,6 +378,7 @@ void ShowSearchEngineSettings(Browser* browser) {
  #if !defined(OS_ANDROID)
  void ShowBrowserSignin(Browser* browser,
                         signin_metrics::AccessPoint access_point) {
@@ -27,7 +27,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);
-@@ -436,6 +431,7 @@ void ShowBrowserSignin(Browser* browser,
+@@ -424,6 +419,7 @@ void ShowBrowserSignin(Browser* browser,
              false));
      DCHECK_GT(browser->tab_strip_model()->count(), 0);
    }
@@ -38,7 +38,7 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.
 diff --git a/components/signin/core/browser/signin_manager_base.cc b/components/signin/core/browser/signin_manager_base.cc
 --- a/components/signin/core/browser/signin_manager_base.cc
 +++ b/components/signin/core/browser/signin_manager_base.cc
-@@ -158,7 +158,7 @@ void SigninManagerBase::Initialize(PrefService* local_state) {
+@@ -162,7 +162,7 @@ void SigninManagerBase::Initialize(PrefService* local_state) {
  bool SigninManagerBase::IsInitialized() const { return initialized_; }
  
  bool SigninManagerBase::IsSigninAllowed() const {

patches/BRM027_ungoogled-chromium-disable-webrtc-log-uploader.patch

@@ -7,7 +7,7 @@ Date:   Mon Feb 12 21:21:36 2018 +0100
 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(
+@@ -117,30 +117,10 @@ void WebRtcLogUploader::LoggingStoppedDoUpload(
    DCHECK(meta_data.get());
    DCHECK(!upload_done_data.log_path.empty());
  
@@ -17,7 +17,7 @@ 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)) {
-     webrtc_logging::DeleteOldWebRtcLogFiles(upload_done_data.log_path);
+     WebRtcLogUtil::DeleteOldWebRtcLogFiles(upload_done_data.log_path);
 -
 -    local_log_id = base::NumberToString(base::Time::Now().ToDoubleT());
 -    base::FilePath log_file_path =
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser
 -    WriteCompressedLogToFile(compressed_log, log_file_path);
 -
 -    base::FilePath log_list_path =
--        webrtc_logging::LogList::GetWebRtcLogListFileForDirectory(
+-        WebRtcLogList::GetWebRtcLogListFileForDirectory(
 -            upload_done_data.log_path);
 -    AddLocallyStoredLogInfoToUploadListFile(log_list_path, local_log_id);
    }
@@ -39,7 +39,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(
+@@ -151,6 +131,9 @@ void WebRtcLogUploader::PrepareMultipartPostData(
    DCHECK(!compressed_log.empty());
    DCHECK(meta_data.get());
  
@@ -49,13 +49,12 @@ 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,44 +220,6 @@ void WebRtcLogUploader::LoggingStoppedDoStore(
+@@ -239,43 +222,6 @@ void WebRtcLogUploader::LoggingStoppedDoStore(
  
-   webrtc_logging::DeleteOldWebRtcLogFiles(log_paths.log_path);
+   WebRtcLogUtil::DeleteOldWebRtcLogFiles(log_paths.log_path);
  
 -  base::FilePath log_list_path =
--      webrtc_logging::LogList::GetWebRtcLogListFileForDirectory(
--          log_paths.log_path);
+-      WebRtcLogList::GetWebRtcLogListFileForDirectory(log_paths.log_path);
 -
 -  // Store the native log with a ".gz" extension.
 -  std::string compressed_log;

patches/BRM028_ungoogled-chromium-disable-untraceable-urls.patch

@@ -7,7 +7,7 @@ Date:   Mon Feb 12 21:28:11 2018 +0100
 diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/android/rlz/rlz_ping_handler.cc
 --- a/chrome/browser/android/rlz/rlz_ping_handler.cc
 +++ b/chrome/browser/android/rlz/rlz_ping_handler.cc
-@@ -66,7 +66,7 @@ void RlzPingHandler::Ping(
+@@ -65,7 +65,7 @@ void RlzPingHandler::Ping(
    DCHECK_EQ(id.length(), 50u);
  
    GURL request_url(base::StringPrintf(
@@ -19,7 +19,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
-@@ -69,7 +69,7 @@ GURL GetPluginsServerURL() {
+@@ -68,7 +68,7 @@ GURL GetPluginsServerURL() {
  #error Unknown platform
  #endif
  
@@ -81,11 +81,14 @@ diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
        INTERNET_FLAG_NO_CACHE_WRITE, 0);
    if (!connection_handle)
      return false;
-@@ -410,7 +410,7 @@ bool FinancialPing::PingServer(const char* request, std::string* response) {
+@@ -407,9 +407,8 @@ bool FinancialPing::PingServer(const char* request, std::string* response) {
+ 
    return true;
  #else
-   std::string url =
--      base::StringPrintf("https://%s%s", kFinancialServer, request);
+-  std::string url = base::StringPrintf("http://%s:%d%s",
+-                                       kFinancialServer, kFinancialPort,
+-                                       request);
++  std::string url =
 +      base::StringPrintf("about:blank");
  
    // Use a waitable event to cause this function to block, to match the
@@ -93,14 +96,16 @@ diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
 diff --git a/rlz/lib/lib_values.cc b/rlz/lib/lib_values.cc
 --- a/rlz/lib/lib_values.cc
 +++ b/rlz/lib/lib_values.cc
-@@ -41,7 +41,6 @@ const char kSetDccResponseVariable[] = "set_dcc";
+@@ -41,8 +41,7 @@ const char kSetDccResponseVariable[] = "set_dcc";
  //
  
  const char kFinancialPingPath[] = "/tools/pso/ping";
 -const char kFinancialServer[]   = "clients1.google.com";
- const int kFinancialPort = 443;
+-const int kFinancialPort = 80;
++const int kFinancialPort = 443;
  
  // Ping times in 100-nanosecond intervals.
+ const int64_t kEventsPingInterval = 24LL * 3600LL * 10000000LL;   // 1 day
 diff --git a/rlz/lib/lib_values.h b/rlz/lib/lib_values.h
 --- a/rlz/lib/lib_values.h
 +++ b/rlz/lib/lib_values.h

patches/BRM030_ungoogled-chromium-disable-profile-avatar-downloading.patch

@@ -7,7 +7,7 @@ Date:   Mon Feb 12 21:29:30 2018 +0100
 diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/browser/profiles/profile_avatar_downloader.cc
 --- a/chrome/browser/profiles/profile_avatar_downloader.cc
 +++ b/chrome/browser/profiles/profile_avatar_downloader.cc
-@@ -16,19 +16,13 @@
+@@ -15,19 +15,13 @@
  #include "net/traffic_annotation/network_traffic_annotation.h"
  #include "ui/gfx/image/image.h"
  

patches/BRM032_ungoogled-chromium-disable-google-host-detection.patch

@@ -7,7 +7,7 @@ Date:   Mon Feb 12 21:36:33 2018 +0100
 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
-@@ -169,9 +169,7 @@ bool DidObserveLoadingBehaviorInAnyFrame(
+@@ -164,9 +164,7 @@ bool DidObserveLoadingBehaviorInAnyFrame(
  }
  
  bool IsGoogleSearchHostname(const GURL& url) {
@@ -317,7 +317,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
-@@ -510,11 +510,6 @@ base::string16 TemplateURLRef::SearchTermToString16(
+@@ -455,11 +455,6 @@ base::string16 TemplateURLRef::SearchTermToString16(
  bool TemplateURLRef::HasGoogleBaseURLs(
      const SearchTermsData& search_terms_data) const {
    ParseIfNecessary(search_terms_data);
@@ -332,7 +332,7 @@ diff --git a/components/search_engines/template_url.cc b/components/search_engin
 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,
+@@ -393,28 +393,6 @@ void GetIdentityFromURL(const GURL& url,
  }
  
  bool HasGoogleHost(const GURL& url) {

patches/BRM033_ungoogled-chromium-disable-gcm.patch

@@ -7,7 +7,7 @@ Date:   Mon Feb 12 21:37:10 2018 +0100
 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
-@@ -502,6 +502,7 @@ void GCMClientImpl::StartGCM() {
+@@ -481,6 +481,7 @@ void GCMClientImpl::StartGCM() {
  }
  
  void GCMClientImpl::InitializeMCSClient() {
@@ -15,7 +15,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();
-@@ -699,6 +700,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) {
+@@ -678,6 +679,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) {
  }
  
  void GCMClientImpl::StartCheckin() {
@@ -23,7 +23,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;
-@@ -777,6 +779,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) {
+@@ -756,6 +758,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) {
  }
  
  void GCMClientImpl::SchedulePeriodicCheckin() {

patches/BRM034_ungoogled-chromium-disable-gaia.patch

@@ -8,7 +8,7 @@ Date:   Mon Feb 12 21:37:52 2018 +0100
 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
-@@ -301,7 +301,6 @@
+@@ -306,7 +306,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" />
@@ -16,14 +16,14 @@ 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" />
-@@ -437,7 +436,6 @@
+@@ -441,7 +440,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" />
 -      <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifest.json" type="BINDATA" />
        <if expr="chromeos">
-         <if expr="optimize_webui">
-           <then>
+         <include name="IDR_BLUETOOTH_PAIRING_DIALOG_HTML" file="resources\chromeos\bluetooth_pairing_dialog.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
+         <include name="IDR_BLUETOOTH_PAIRING_DIALOG_JS" file="resources\chromeos\bluetooth_pairing_dialog.js" type="chrome_html" />
 diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
 --- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
 +++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
@@ -72,7 +72,7 @@ diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome
 diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc
 --- a/chrome/browser/ui/webui/signin/inline_login_ui.cc
 +++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
-@@ -44,7 +44,6 @@ content::WebUIDataSource* CreateWebUIDataSource() {
+@@ -43,7 +43,6 @@ content::WebUIDataSource* CreateWebUIDataSource() {
  
    source->AddResourcePath("inline_login.css", IDR_INLINE_LOGIN_CSS);
    source->AddResourcePath("inline_login.js", IDR_INLINE_LOGIN_JS);

patches/BRM035_ungoogled-chromium-clear-http-cache-menu-item.patch

@@ -7,7 +7,7 @@ Date:   Mon Feb 12 21:45:21 2018 +0100
 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
-@@ -150,6 +150,7 @@
+@@ -149,6 +149,7 @@
  #define IDC_DEV_TOOLS_INSPECT           40023
  #define IDC_UPGRADE_DIALOG              40024
  #define IDC_VIEW_INCOMPATIBILITIES      40025
@@ -18,7 +18,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
-@@ -1062,6 +1062,9 @@ are declared in build/common.gypi.
+@@ -1064,6 +1064,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>
@@ -28,7 +28,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>
-@@ -1100,6 +1103,9 @@ are declared in build/common.gypi.
+@@ -1102,6 +1105,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>
@@ -42,8 +42,8 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui
 --- a/chrome/browser/ui/browser_command_controller.cc
 +++ b/chrome/browser/ui/browser_command_controller.cc
 @@ -59,6 +59,9 @@
- #include "extensions/browser/extension_system.h"
  #include "printing/features/features.h"
+ #include "services/service_manager/public/cpp/connector.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"
@@ -51,7 +51,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"
-@@ -624,6 +627,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
+@@ -640,6 +643,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
      case IDC_CLEAR_BROWSING_DATA:
        ShowClearBrowsingDataDialog(browser_);
        break;
@@ -61,18 +61,18 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui
      case IDC_IMPORT_SETTINGS:
        ShowImportDialog(browser_);
        break;
-@@ -865,6 +871,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -891,6 +897,7 @@ void BrowserCommandController::InitCommandState() {
                                          !profile()->IsOffTheRecord());
    command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA,
                                          !guest_session);
 +  command_updater_.UpdateCommandEnabled(IDC_CLEAR_HTTP_AUTH_CACHE, true);
  #if defined(OS_CHROMEOS)
    command_updater_.UpdateCommandEnabled(IDC_TAKE_SCREENSHOT, true);
- #else
+   command_updater_.UpdateCommandEnabled(IDC_TOUCH_HUD_PROJECTION_TOGGLE, true);
 diff --git a/chrome/browser/ui/toolbar/app_menu_model.cc b/chrome/browser/ui/toolbar/app_menu_model.cc
 --- a/chrome/browser/ui/toolbar/app_menu_model.cc
 +++ b/chrome/browser/ui/toolbar/app_menu_model.cc
-@@ -215,6 +215,7 @@ void ToolsMenuModel::Build(Browser* browser) {
+@@ -195,6 +195,7 @@ void ToolsMenuModel::Build(Browser* browser) {
  
    AddSeparator(ui::NORMAL_SEPARATOR);
    AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
@@ -80,7 +80,7 @@ diff --git a/chrome/browser/ui/toolbar/app_menu_model.cc b/chrome/browser/ui/too
    AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
    if (chrome::CanOpenTaskManager())
      AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
-@@ -475,6 +476,13 @@ void AppMenuModel::LogMenuMetrics(int command_id) {
+@@ -452,6 +453,13 @@ void AppMenuModel::LogMenuMetrics(int command_id) {
        }
        LogMenuAction(MENU_ACTION_CLEAR_BROWSING_DATA);
        break;
@@ -97,10 +97,10 @@ diff --git a/chrome/browser/ui/toolbar/app_menu_model.cc b/chrome/browser/ui/too
 diff --git a/chrome/browser/ui/toolbar/app_menu_model.h b/chrome/browser/ui/toolbar/app_menu_model.h
 --- a/chrome/browser/ui/toolbar/app_menu_model.h
 +++ b/chrome/browser/ui/toolbar/app_menu_model.h
-@@ -76,6 +76,7 @@ enum AppMenuAction {
-   MENU_ACTION_OPEN_IN_CHROME = 48,
-   MENU_ACTION_SITE_SETTINGS = 49,
-   MENU_ACTION_APP_INFO = 50,
+@@ -72,6 +72,7 @@ enum AppMenuAction {
+   MENU_ACTION_UPGRADE_DIALOG = 44,
+   MENU_ACTION_CAST = 45,
+   MENU_ACTION_BETA_FORUM = 46,
 +  MENU_ACTION_CLEAR_HTTP_AUTH_CACHE = 51,
    LIMIT_MENU_ACTION
  };
@@ -145,10 +145,10 @@ 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
-@@ -46704,6 +46704,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"/>
+@@ -44908,6 +44908,7 @@ Called by update_traffic_annotation_histograms.py.-->
+   <int value="43" label="Exit"/>
+   <int value="44" label="Upgrade browser"/>
+   <int value="45" label="Cast"/>
 +  <int value="51" label="Clear HTTP auth cache"/>
  </enum>
  
@@ -156,7 +156,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
-@@ -103940,6 +103940,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
+@@ -100011,6 +100011,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/BRM037_play-videos-in-background.patch

@@ -8,7 +8,7 @@ Date:   Sun Feb 18 22:15:25 2018 +0100
 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
-@@ -302,6 +302,7 @@ blink_core_sources("dom") {
+@@ -347,6 +347,7 @@ blink_core_sources("dom") {
      "events/WindowEventContext.cpp",
      "events/WindowEventContext.h",
      "extensions/dont-track-me.h",
@@ -19,7 +19,7 @@ diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/So
 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
-@@ -222,6 +222,7 @@
+@@ -220,6 +220,7 @@
  #include "core/xml_names.h"
  #include "core/xmlns_names.h"
  #include "extensions/dont-track-me.h"
@@ -27,7 +27,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"
-@@ -5797,17 +5798,25 @@ void Document::FinishedParsing() {
+@@ -5817,17 +5818,25 @@ void Document::FinishedParsing() {
  
    // determine whether this is a Google search results page
    const SecurityOrigin *origin = GetSecurityOrigin();