Selaa lähdekoodia

Patches ready for 65.0.3325.176

csagan5 7 vuotta sitten
vanhempi
commit
6b1cbc612a
32 muutettua tiedostoa jossa 15726 lisäystä ja 17110 poistoa
  1. 6 0
      CHANGELOG.md
  2. 1 1
      patches/BRM002_restore-classic-new-tab-page.patch
  3. 2 2
      patches/BRM009_disables-omission-of-url-elements-in-omnibox.patch
  4. 5 5
      patches/BRM010_modify-default-preferences.patch
  5. 1 1
      patches/BRM011_do-not-store-passwords-by-default.patch
  6. 1 1
      patches/BRM012_disable-ntp-remote-suggestions-by-default.patch
  7. 2 2
      patches/BRM015_ported-data-reduction-disable-patch.patch
  8. 10 7
      patches/BRM016_skip-the-first-run-and-metrics.patch
  9. 1 1
      patches/BRM017_always-disable-omaha-update-checks.patch
  10. 2 9
      patches/BRM018_add-duckduckgo-search-engine-not-enabled-by-default.patch
  11. 2 2
      patches/BRM019_add-startpage-search-engine.patch
  12. 2 2
      patches/BRM020_added-google-english-only-engine-no-rlz-and-field-experiments.patch
  13. 707 0
      patches/BRM021_add-qwant-search-engine.patch
  14. 0 0
      patches/BRM022_fix-crash-when-accessing-page-info-site-settings.patch
  15. 21 11
      patches/BRM023_compile-with-arm-arm64-optimizations-for-h264.patch
  16. 3 3
      patches/BRM024_do-not-track-google-search-results-clicks.patch
  17. 3 3
      patches/BRM025_play-videos-in-background.patch
  18. 0 0
      patches/BRM026_never-send-any-crash-upload-data.patch
  19. 0 0
      patches/BRM027_never-fetch-popular-sites.patch
  20. 4 4
      patches/BRM028_ungoogled-chromium-disable-signin.patch
  21. 3 3
      patches/BRM029_ungoogled-chromium-disable-webrtc-log-uploader.patch
  22. 6 11
      patches/BRM030_ungoogled-chromium-disable-untraceable-urls.patch
  23. 0 0
      patches/BRM031_ungoogled-chromium-disable-translate.patch
  24. 1 1
      patches/BRM032_ungoogled-chromium-disable-profile-avatar-downloading.patch
  25. 0 0
      patches/BRM033_ungoogled-chromium-disable-intranet-redirect-detector.patch
  26. 1 1
      patches/BRM034_ungoogled-chromium-disable-google-host-detection.patch
  27. 0 0
      patches/BRM035_ungoogled-chromium-disable-gcm.patch
  28. 0 17018
      patches/BRM036_bromite-adblock-engine.patch
  29. 5 5
      patches/BRM036_ungoogled-chromium-disable-gaia.patch
  30. 17 17
      patches/BRM037_ungoogled-chromium-clear-http-cache-menu-item.patch
  31. 14872 0
      patches/BRM038_bromite-adblock-engine.patch
  32. 48 0
      patches/BRM039_user-agent-anonymize.patch

+ 6 - 0
CHANGELOG.md

@@ -1,3 +1,9 @@
+# 65.0.3325.176
+* remove device name and build id from User Agent
+* added Qwant search engine
+* updated AdBlock filters
+* disable non-working 3rd-party filters support
+
 # 64.0.3282.204
 * use H264 NEON optimizations also for arm64
 * fix build of Stable channel

+ 1 - 1
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
-@@ -115,10 +115,7 @@ bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) {
+@@ -155,10 +155,7 @@ bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) {
  }
  
  bool ShouldShowLocalNewTab(Profile* profile) {

+ 2 - 2
patches/BRM009_disables-omission-of-url-elements-in-omnibox.patch

@@ -17,13 +17,13 @@ diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatte
 -const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2;
 -const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
 -const FormatUrlType kFormatUrlExperimentalElideAfterHost = 1 << 4;
--const FormatUrlType kFormatUrlExperimentalOmitTrivialSubdomains = 1 << 5;
+-const FormatUrlType kFormatUrlOmitTrivialSubdomains = 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 kFormatUrlExperimentalOmitTrivialSubdomains = 0 << 5;
++const FormatUrlType kFormatUrlOmitTrivialSubdomains = 0 << 5;
  
  const FormatUrlType kFormatUrlOmitDefaults =
      kFormatUrlOmitUsernamePassword | kFormatUrlOmitHTTP |

+ 5 - 5
patches/BRM010_modify-default-preferences.patch

@@ -18,7 +18,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -878,7 +878,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -858,7 +858,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -30,7 +30,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 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
-@@ -612,7 +612,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -620,7 +620,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
                                 std::string());
    registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
    data_reduction_proxy::RegisterPrefs(registry);
@@ -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
-@@ -136,7 +136,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN";
+@@ -138,7 +138,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN";
  void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kSearchSuggestEnabled,
@@ -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
-@@ -143,10 +143,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
+@@ -144,10 +144,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
-@@ -217,7 +217,7 @@ void AutofillManager::RegisterProfilePrefs(
+@@ -216,7 +216,7 @@ void AutofillManager::RegisterProfilePrefs(
    registry->RegisterIntegerPref(
        prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
    registry->RegisterBooleanPref(

+ 1 - 1
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
-@@ -235,10 +235,10 @@ PasswordFormManager* FindMatchedManager(
+@@ -236,10 +236,10 @@ PasswordFormManager* FindMatchedManager(
  void PasswordManager::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(

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

@@ -6,7 +6,7 @@ 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
-@@ -38,16 +38,16 @@ const base::Feature* const kAllFeatures[] = {
+@@ -37,16 +37,16 @@ const base::Feature* const kAllFeatures[] = {
      nullptr};
  
  const base::Feature kArticleSuggestionsFeature{

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

@@ -6,11 +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
-@@ -146,7 +146,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -140,7 +140,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(pageOf(DataReductionProxyFirstRunFragment.class));
+-            mPages.add(new DataReductionProxyFirstRunFragment.Page());
              mFreProgressStates.add(FRE_PROGRESS_DATA_SAVER_SHOWN);
              notifyAdapter = true;
          }

+ 10 - 7
patches/BRM016_skip-the-first-run-and-metrics.patch

@@ -6,21 +6,24 @@ 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
-@@ -34,8 +34,12 @@ public class FirstRunStatus {
+@@ -36,12 +36,11 @@ public class FirstRunStatus {
       * includes ToS and Sign In pages if necessary.
       */
      public static boolean getFirstRunFlowComplete() {
--        return ContextUtils.getAppSharedPreferences()
-+        boolean complete = ContextUtils.getAppSharedPreferences()
-                 .getBoolean(FIRST_RUN_FLOW_COMPLETE, false);
+-        if (ContextUtils.getAppSharedPreferences().getBoolean(FIRST_RUN_FLOW_COMPLETE, false)) {
+-            return true;
++        boolean complete = ContextUtils.getAppSharedPreferences().getBoolean(FIRST_RUN_FLOW_COMPLETE, false);
 +        if (!complete) {
 +             setFirstRunFlowComplete(true);
-+        }
+         }
+-        return CommandLine.isInitialized()
+-                && CommandLine.getInstance().hasSwitch(
+-                           ChromeSwitches.FORCE_FIRST_RUN_FLOW_COMPLETE_FOR_TESTING);
 +        return true;
      }
  
      /**
-@@ -71,4 +75,4 @@ public class FirstRunStatus {
+@@ -77,4 +76,4 @@ public class FirstRunStatus {
          return ContextUtils.getAppSharedPreferences().getBoolean(
                  LIGHTWEIGHT_FIRST_RUN_FLOW_COMPLETE, false);
      }
@@ -56,7 +59,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
-@@ -60,20 +60,14 @@ public class ToSAndUMAFirstRunFragment extends FirstRunPage {
+@@ -73,20 +73,14 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
              }
          });
  

+ 1 - 1
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
-@@ -121,7 +121,7 @@ public class OmahaBase {
+@@ -122,7 +122,7 @@ public class OmahaBase {
  
      /** See {@link #sIsDisabled}. */
      static boolean isDisabled() {

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

@@ -6,14 +6,7 @@ Date:   Thu Oct 12 11:06:18 2017 +0200
 diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
-@@ -32,12 +32,31 @@
- 
-     // Increment this if you change the data in ways that mean users with
-     // existing data should get a new version.
--    "kCurrentDataVersion": 99
-+    "kCurrentDataVersion": 100
-   },
- 
+@@ -38,6 +38,25 @@
    // The following engines are included in country lists and are added to the
    // list of search engines on the first run depending on user's country.
    "elements": {
@@ -54,7 +47,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
-@@ -50,548 +50,548 @@ namespace {
+@@ -51,548 +51,548 @@ namespace {
  
  // Default (for countries with no better engine set)
  const PrepopulatedEngine* const engines_default[] = {

+ 2 - 2
patches/BRM019_add-startpage-search-engine.patch

@@ -15,7 +15,7 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
    },
  
    // The following engines are included in country lists and are added to the
-@@ -228,6 +228,16 @@
+@@ -232,6 +232,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
-@@ -50,548 +50,548 @@ namespace {
+@@ -51,548 +51,548 @@ namespace {
  
  // Default (for countries with no better engine set)
  const PrepopulatedEngine* const engines_default[] = {

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

@@ -15,7 +15,7 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
    },
  
    // The following engines are included in country lists and are added to the
-@@ -150,6 +150,27 @@
+@@ -154,6 +154,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
-@@ -50,548 +50,548 @@ namespace {
+@@ -51,548 +51,548 @@ namespace {
  
  // Default (for countries with no better engine set)
  const PrepopulatedEngine* const engines_default[] = {

+ 707 - 0
patches/BRM021_add-qwant-search-engine.patch

@@ -0,0 +1,707 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Mon Mar 12 20:31:44 2018 +0100
+
+    Add Qwant search engine
+
+diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
+--- a/components/search_engines/prepopulated_engines.json
++++ b/components/search_engines/prepopulated_engines.json
+@@ -32,7 +32,7 @@
+ 
+     // Increment this if you change the data in ways that mean users with
+     // existing data should get a new version.
+-    "kCurrentDataVersion": 102
++    "kCurrentDataVersion": 103
+   },
+ 
+   // The following engines are included in country lists and are added to the
+@@ -939,6 +939,17 @@
+       "id": 6
+     },
+ 
++    "qwant": {
++      "name": "Qwant",
++      "keyword": "qwant.com",
++      "favicon_url": "https://www.qwant.com/favicon.ico",
++      "search_url": "https://www.qwant.com/?client=opensearch&q={searchTerms}",
++      "suggest_url": "https://api.qwant.com/api/suggest/?client=opensearch&q={searchTerms}",
++      "image_url": "https://www.qwant.com/?t=images&q={searchTerms}",
++      "type": "SEARCH_ENGINE_QWANT",
++      "id": 14
++    },
++
+     "rambler": {
+       "name": "\u0420\u0430\u043c\u0431\u043b\u0435\u0440",
+       "keyword": "rambler.ru",
+diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
+--- a/components/search_engines/search_engine_type.h
++++ b/components/search_engines/search_engine_type.h
+@@ -67,6 +67,7 @@ enum SearchEngineType {
+   SEARCH_ENGINE_DUCKDUCKGOLIGHT,
+   SEARCH_ENGINE_STARTPAGE,
+   SEARCH_ENGINE_GOOGLE_EN,
++  SEARCH_ENGINE_QWANT,
+   SEARCH_ENGINE_MAX          // Bounding value needed for UMA histogram macro.
+ };
+ 
+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 {
+ 
+ // Default (for countries with no better engine set)
+ const PrepopulatedEngine* const engines_default[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // United Arab Emirates
+ const PrepopulatedEngine* const engines_AE[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Albania
+ const PrepopulatedEngine* const engines_AL[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Argentina
+ const PrepopulatedEngine* const engines_AR[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,
+ };
+ 
+ // Austria
+ const PrepopulatedEngine* const engines_AT[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,
+ };
+ 
+ // Australia
+ const PrepopulatedEngine* const engines_AU[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,
+ };
+ 
+ // Bosnia and Herzegovina
+ const PrepopulatedEngine* const engines_BA[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Belgium
+ const PrepopulatedEngine* const engines_BE[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,
+ };
+ 
+ // Bulgaria
+ const PrepopulatedEngine* const engines_BG[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &ask,
+ };
+ 
+ // Bahrain
+ const PrepopulatedEngine* const engines_BH[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Burundi
+ const PrepopulatedEngine* const engines_BI[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Brunei
+ const PrepopulatedEngine* const engines_BN[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
+ };
+ 
+ // Bolivia
+ const PrepopulatedEngine* const engines_BO[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Brazil
+ const PrepopulatedEngine* const engines_BR[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,
+ };
+ 
+ // Belarus
+ const PrepopulatedEngine* const engines_BY[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,
+ };
+ 
+ // Belize
+ const PrepopulatedEngine* const engines_BZ[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Canada
+ const PrepopulatedEngine* const engines_CA[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,
+ };
+ 
+ // Switzerland
+ const PrepopulatedEngine* const engines_CH[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,
+ };
+ 
+ // Chile
+ const PrepopulatedEngine* const engines_CL[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,
+ };
+ 
+ // China
+ const PrepopulatedEngine* const engines_CN[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,
+ };
+ 
+ // Colombia
+ const PrepopulatedEngine* const engines_CO[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,
+ };
+ 
+ // Costa Rica
+ const PrepopulatedEngine* const engines_CR[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Czech Republic
+ const PrepopulatedEngine* const engines_CZ[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &seznam, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &seznam, &bing,
+ };
+ 
+ // Germany
+ const PrepopulatedEngine* const engines_DE[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
+ };
+ 
+ // Denmark
+ const PrepopulatedEngine* const engines_DK[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,
+ };
+ 
+ // Dominican Republic
+ const PrepopulatedEngine* const engines_DO[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Algeria
+ const PrepopulatedEngine* const engines_DZ[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+ };
+ 
+ // Ecuador
+ const PrepopulatedEngine* const engines_EC[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Estonia
+ const PrepopulatedEngine* const engines_EE[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Egypt
+ const PrepopulatedEngine* const engines_EG[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Spain
+ const PrepopulatedEngine* const engines_ES[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,
+ };
+ 
+ // Faroe Islands
+ const PrepopulatedEngine* const engines_FO[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &ask,
+ };
+ 
+ // Finland
+ const PrepopulatedEngine* const engines_FI[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,
+ };
+ 
+ // France
+ const PrepopulatedEngine* const engines_FR[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
+ };
+ 
+ // United Kingdom
+ const PrepopulatedEngine* const engines_GB[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,
+ };
+ 
+ // Greece
+ const PrepopulatedEngine* const engines_GR[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,
+ };
+ 
+ // Guatemala
+ const PrepopulatedEngine* const engines_GT[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Hong Kong
+ const PrepopulatedEngine* const engines_HK[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,
+ };
+ 
+ // Honduras
+ const PrepopulatedEngine* const engines_HN[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Croatia
+ const PrepopulatedEngine* const engines_HR[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Hungary
+ const PrepopulatedEngine* const engines_HU[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Indonesia
+ const PrepopulatedEngine* const engines_ID[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,
+ };
+ 
+ // Ireland
+ const PrepopulatedEngine* const engines_IE[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,
+ };
+ 
+ // Israel
+ const PrepopulatedEngine* const engines_IL[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // India
+ const PrepopulatedEngine* const engines_IN[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,
+ };
+ 
+ // Iraq
+ const PrepopulatedEngine* const engines_IQ[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Iran
+ const PrepopulatedEngine* const engines_IR[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Iceland
+ const PrepopulatedEngine* const engines_IS[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Italy
+ const PrepopulatedEngine* const engines_IT[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &virgilio, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &virgilio, &bing,
+ };
+ 
+ // Jamaica
+ const PrepopulatedEngine* const engines_JM[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Jordan
+ const PrepopulatedEngine* const engines_JO[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Japan
+ const PrepopulatedEngine* const engines_JP[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,
+ };
+ 
+ // Kenya
+ const PrepopulatedEngine* const engines_KE[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Kuwait
+ const PrepopulatedEngine* const engines_KW[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // South Korea
+ const PrepopulatedEngine* const engines_KR[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &naver, &daum,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &naver, &daum,
+ };
+ 
+ // Kazakhstan
+ const PrepopulatedEngine* const engines_KZ[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,
+ };
+ 
+ // Lebanon
+ const PrepopulatedEngine* const engines_LB[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Liechtenstein
+ const PrepopulatedEngine* const engines_LI[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
+ };
+ 
+ // Lithuania
+ const PrepopulatedEngine* const engines_LT[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,
+ };
+ 
+ // Luxembourg
+ const PrepopulatedEngine* const engines_LU[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
+ };
+ 
+ // Latvia
+ const PrepopulatedEngine* const engines_LV[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,
+ };
+ 
+ // Libya
+ const PrepopulatedEngine* const engines_LY[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Morocco
+ const PrepopulatedEngine* const engines_MA[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+ };
+ 
+ // Monaco
+ const PrepopulatedEngine* const engines_MC[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,
+ };
+ 
+ // Moldova
+ const PrepopulatedEngine* const engines_MD[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Montenegro
+ const PrepopulatedEngine* const engines_ME[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Macedonia
+ const PrepopulatedEngine* const engines_MK[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Mexico
+ const PrepopulatedEngine* const engines_MX[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,
+ };
+ 
+ // Malaysia
+ const PrepopulatedEngine* const engines_MY[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
+ };
+ 
+ // Nicaragua
+ const PrepopulatedEngine* const engines_NI[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Netherlands
+ const PrepopulatedEngine* const engines_NL[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,
+ };
+ 
+ // Norway
+ const PrepopulatedEngine* const engines_NO[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &kvasir,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &kvasir,
+ };
+ 
+ // New Zealand
+ const PrepopulatedEngine* const engines_NZ[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,
+ };
+ 
+ // Oman
+ const PrepopulatedEngine* const engines_OM[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+ };
+ 
+ // Panama
+ const PrepopulatedEngine* const engines_PA[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Peru
+ const PrepopulatedEngine* const engines_PE[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,
+ };
+ 
+ // Philippines
+ const PrepopulatedEngine* const engines_PH[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,
+ };
+ 
+ // Pakistan
+ const PrepopulatedEngine* const engines_PK[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Puerto Rico
+ const PrepopulatedEngine* const engines_PR[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Poland
+ const PrepopulatedEngine* const engines_PL[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &onet, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &onet, &bing,
+ };
+ 
+ // Portugal
+ const PrepopulatedEngine* const engines_PT[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Paraguay
+ const PrepopulatedEngine* const engines_PY[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Qatar
+ const PrepopulatedEngine* const engines_QA[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Romania
+ const PrepopulatedEngine* const engines_RO[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,
+ };
+ 
+ // Serbia
+ const PrepopulatedEngine* const engines_RS[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Russia
+ const PrepopulatedEngine* const engines_RU[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,
+ };
+ 
+ // Rwanda
+ const PrepopulatedEngine* const engines_RW[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Saudi Arabia
+ const PrepopulatedEngine* const engines_SA[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Sweden
+ const PrepopulatedEngine* const engines_SE[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,
+ };
+ 
+ // Singapore
+ const PrepopulatedEngine* const engines_SG[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,
+ };
+ 
+ // Slovenia
+ const PrepopulatedEngine* const engines_SI[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &najdi, &ask,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &najdi, &ask,
+ };
+ 
+ // Slovakia
+ const PrepopulatedEngine* const engines_SK[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // El Salvador
+ const PrepopulatedEngine* const engines_SV[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Syria
+ const PrepopulatedEngine* const engines_SY[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+ };
+ 
+ // Thailand
+ const PrepopulatedEngine* const engines_TH[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,
+ };
+ 
+ // Tunisia
+ const PrepopulatedEngine* const engines_TN[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+ };
+ 
+ // Turkey
+ const PrepopulatedEngine* const engines_TR[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,
+ };
+ 
+ // Trinidad and Tobago
+ const PrepopulatedEngine* const engines_TT[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Taiwan
+ const PrepopulatedEngine* const engines_TW[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,
+ };
+ 
+ // Tanzania
+ const PrepopulatedEngine* const engines_TZ[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Ukraine
+ const PrepopulatedEngine* const engines_UA[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,
+ };
+ 
+ // United States
+ const PrepopulatedEngine* const engines_US[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,
+ };
+ 
+ // Uruguay
+ const PrepopulatedEngine* const engines_UY[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Venezuela
+ const PrepopulatedEngine* const engines_VE[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,
+ };
+ 
+ // Vietnam
+ const PrepopulatedEngine* const engines_VN[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,
+ };
+ 
+ // Yemen
+ const PrepopulatedEngine* const engines_YE[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+ };
+ 
+ // South Africa
+ const PrepopulatedEngine* const engines_ZA[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Zimbabwe
+ const PrepopulatedEngine* const engines_ZW[] = {
+-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &ask,
++    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &ask,
+ };
+ 
+ // A list of all the engines that we know about.
+ const PrepopulatedEngine* const kAllEngines[] = {
+     // Prepopulated engines:
+-    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &kvasir,
++    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &kvasir,
+     &mail_ru, &najdi, &naver, &onet, &seznam, &sogou, &vinden, &virgilio,
+     &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
+     &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,

+ 0 - 0
patches/BRM021_fix-crash-when-accessing-page-info-site-settings.patch → patches/BRM022_fix-crash-when-accessing-page-info-site-settings.patch


+ 21 - 11
patches/BRM022_compile-with-arm-arm64-optimizations-for-h264.patch → patches/BRM023_compile-with-arm-arm64-optimizations-for-h264.patch

@@ -7,25 +7,35 @@ Date:   Sat Jan 20 21:17:27 2018 +0100
 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) {
+@@ -146,11 +146,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
+ #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") {
+@@ -10,6 +10,7 @@ import("//third_party/yasm/yasm_assemble.gni")
+ # Config shared by all openh264 targets.
+ config("config") {
    cflags = []
-   defines = []
++  defines = []
+ 
+   if (is_chromeos && target_cpu == "arm") {
+     # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS
+@@ -20,6 +21,20 @@ config("config") {
+     ]
+   }
  
 +  # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS
 +  # devices.
@@ -44,8 +54,8 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
    # 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
+@@ -128,6 +143,14 @@ source_set("common") {
+   }
    include_dirs = openh264_common_include_dirs
  
 +  # enable ARM optimizations
@@ -59,8 +69,8 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
    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
+@@ -154,6 +177,14 @@ source_set("processing") {
+   }
    include_dirs = openh264_processing_include_dirs
  
 +  # enable ARM optimizations
@@ -74,8 +84,8 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
    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
+@@ -173,6 +204,14 @@ source_set("encoder") {
+   }
    include_dirs = openh264_encoder_include_dirs
  
 +  # enable ARM optimizations

+ 3 - 3
patches/BRM023_do-not-track-google-search-results-clicks.patch → patches/BRM024_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
-@@ -346,6 +346,7 @@ blink_core_sources("dom") {
+@@ -296,6 +296,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
-@@ -219,6 +219,7 @@
+@@ -220,6 +220,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"
-@@ -5809,8 +5810,24 @@ void Document::FinishedParsing() {
+@@ -5858,8 +5859,24 @@ void Document::FinishedParsing() {
      fetcher_->ClearResourcesFromPreviousFetcher();
    }
  

+ 3 - 3
patches/BRM037_play-videos-in-background.patch → patches/BRM025_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
-@@ -347,6 +347,7 @@ blink_core_sources("dom") {
+@@ -297,6 +297,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
-@@ -220,6 +220,7 @@
+@@ -221,6 +221,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"
-@@ -5817,17 +5818,25 @@ void Document::FinishedParsing() {
+@@ -5866,17 +5867,25 @@ void Document::FinishedParsing() {
  
    // determine whether this is a Google search results page
    const SecurityOrigin *origin = GetSecurityOrigin();

+ 0 - 0
patches/BRM024_never-send-any-crash-upload-data.patch → patches/BRM026_never-send-any-crash-upload-data.patch


+ 0 - 0
patches/BRM025_never-fetch-popular-sites.patch → patches/BRM027_never-fetch-popular-sites.patch


+ 4 - 4
patches/BRM026_ungoogled-chromium-disable-signin.patch → patches/BRM028_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
-@@ -74,12 +74,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) {
+@@ -76,12 +76,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
-@@ -384,6 +378,7 @@ void ShowSearchEngineSettings(Browser* browser) {
+@@ -386,6 +380,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);
-@@ -424,6 +419,7 @@ void ShowBrowserSignin(Browser* browser,
+@@ -426,6 +421,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
-@@ -162,7 +162,7 @@ void SigninManagerBase::Initialize(PrefService* local_state) {
+@@ -158,7 +158,7 @@ void SigninManagerBase::Initialize(PrefService* local_state) {
  bool SigninManagerBase::IsInitialized() const { return initialized_; }
  
  bool SigninManagerBase::IsSigninAllowed() const {

+ 3 - 3
patches/BRM027_ungoogled-chromium-disable-webrtc-log-uploader.patch → patches/BRM029_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
-@@ -117,30 +117,10 @@ void WebRtcLogUploader::LoggingStoppedDoUpload(
+@@ -115,30 +115,10 @@ void WebRtcLogUploader::LoggingStoppedDoUpload(
    DCHECK(meta_data.get());
    DCHECK(!upload_done_data.log_path.empty());
  
@@ -39,7 +39,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser
  }
  
  void WebRtcLogUploader::PrepareMultipartPostData(
-@@ -151,6 +131,9 @@ void WebRtcLogUploader::PrepareMultipartPostData(
+@@ -149,6 +129,9 @@ void WebRtcLogUploader::PrepareMultipartPostData(
    DCHECK(!compressed_log.empty());
    DCHECK(meta_data.get());
  
@@ -49,7 +49,7 @@ 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,
-@@ -239,43 +222,6 @@ void WebRtcLogUploader::LoggingStoppedDoStore(
+@@ -237,43 +220,6 @@ void WebRtcLogUploader::LoggingStoppedDoStore(
  
    WebRtcLogUtil::DeleteOldWebRtcLogFiles(log_paths.log_path);
  

+ 6 - 11
patches/BRM028_ungoogled-chromium-disable-untraceable-urls.patch → patches/BRM030_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
-@@ -65,7 +65,7 @@ void RlzPingHandler::Ping(
+@@ -66,7 +66,7 @@ void RlzPingHandler::Ping(
    DCHECK_EQ(id.length(), 50u);
  
    GURL request_url(base::StringPrintf(
@@ -81,14 +81,11 @@ 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;
-@@ -407,9 +407,8 @@ bool FinancialPing::PingServer(const char* request, std::string* response) {
- 
+@@ -410,7 +410,7 @@ bool FinancialPing::PingServer(const char* request, std::string* response) {
    return true;
  #else
--  std::string url = base::StringPrintf("http://%s:%d%s",
--                                       kFinancialServer, kFinancialPort,
--                                       request);
-+  std::string url =
+   std::string url =
+-      base::StringPrintf("https://%s%s", kFinancialServer, request);
 +      base::StringPrintf("about:blank");
  
    // Use a waitable event to cause this function to block, to match the
@@ -96,16 +93,14 @@ 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,8 +41,7 @@ const char kSetDccResponseVariable[] = "set_dcc";
+@@ -41,7 +41,6 @@ const char kSetDccResponseVariable[] = "set_dcc";
  //
  
  const char kFinancialPingPath[] = "/tools/pso/ping";
 -const char kFinancialServer[]   = "clients1.google.com";
--const int kFinancialPort = 80;
-+const int kFinancialPort = 443;
+ 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

+ 0 - 0
patches/BRM029_ungoogled-chromium-disable-translate.patch → patches/BRM031_ungoogled-chromium-disable-translate.patch


+ 1 - 1
patches/BRM030_ungoogled-chromium-disable-profile-avatar-downloading.patch → patches/BRM032_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
-@@ -15,19 +15,13 @@
+@@ -16,19 +16,13 @@
  #include "net/traffic_annotation/network_traffic_annotation.h"
  #include "ui/gfx/image/image.h"
  

+ 0 - 0
patches/BRM031_ungoogled-chromium-disable-intranet-redirect-detector.patch → patches/BRM033_ungoogled-chromium-disable-intranet-redirect-detector.patch


+ 1 - 1
patches/BRM032_ungoogled-chromium-disable-google-host-detection.patch → patches/BRM034_ungoogled-chromium-disable-google-host-detection.patch

@@ -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
-@@ -393,28 +393,6 @@ void GetIdentityFromURL(const GURL& url,
+@@ -397,28 +397,6 @@ void GetIdentityFromURL(const GURL& url,
  }
  
  bool HasGoogleHost(const GURL& url) {

+ 0 - 0
patches/BRM033_ungoogled-chromium-disable-gcm.patch → patches/BRM035_ungoogled-chromium-disable-gcm.patch


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 17018
patches/BRM036_bromite-adblock-engine.patch


+ 5 - 5
patches/BRM034_ungoogled-chromium-disable-gaia.patch → patches/BRM036_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
-@@ -306,7 +306,6 @@
+@@ -307,7 +307,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" />
-@@ -441,7 +440,6 @@
+@@ -445,7 +444,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">
-         <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" />
+         <if expr="optimize_webui">
+           <then>
 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
-@@ -43,7 +43,6 @@ content::WebUIDataSource* CreateWebUIDataSource() {
+@@ -44,7 +44,6 @@ content::WebUIDataSource* CreateWebUIDataSource() {
  
    source->AddResourcePath("inline_login.css", IDR_INLINE_LOGIN_CSS);
    source->AddResourcePath("inline_login.js", IDR_INLINE_LOGIN_JS);

+ 17 - 17
patches/BRM035_ungoogled-chromium-clear-http-cache-menu-item.patch → patches/BRM037_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
-@@ -149,6 +149,7 @@
+@@ -148,6 +148,7 @@
  #define IDC_DEV_TOOLS_INSPECT           40023
  #define IDC_UPGRADE_DIALOG              40024
  #define IDC_VIEW_INCOMPATIBILITIES      40025
@@ -41,9 +41,9 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
 diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
 --- a/chrome/browser/ui/browser_command_controller.cc
 +++ b/chrome/browser/ui/browser_command_controller.cc
-@@ -59,6 +59,9 @@
+@@ -58,6 +58,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"
-@@ -640,6 +643,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
+@@ -625,6 +628,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;
-@@ -891,6 +897,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -867,6 +873,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);
-   command_updater_.UpdateCommandEnabled(IDC_TOUCH_HUD_PROJECTION_TOGGLE, true);
+ #else
 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
-@@ -195,6 +195,7 @@ void ToolsMenuModel::Build(Browser* browser) {
+@@ -215,6 +215,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);
-@@ -452,6 +453,13 @@ void AppMenuModel::LogMenuMetrics(int command_id) {
+@@ -475,6 +476,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
-@@ -72,6 +72,7 @@ enum AppMenuAction {
-   MENU_ACTION_UPGRADE_DIALOG = 44,
-   MENU_ACTION_CAST = 45,
-   MENU_ACTION_BETA_FORUM = 46,
+@@ -76,6 +76,7 @@ enum AppMenuAction {
+   MENU_ACTION_OPEN_IN_CHROME = 48,
+   MENU_ACTION_SITE_SETTINGS = 49,
+   MENU_ACTION_APP_INFO = 50,
 +  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
-@@ -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"/>
+@@ -46154,6 +46154,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"/>
 +  <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
-@@ -100011,6 +100011,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
+@@ -102544,6 +102544,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."/>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 14872 - 0
patches/BRM038_bromite-adblock-engine.patch


+ 48 - 0
patches/BRM039_user-agent-anonymize.patch

@@ -0,0 +1,48 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Wed Mar 21 14:15:28 2018 +0100
+
+    User Agent: anonymize
+    Replace device name and build id with a fixed one
+
+diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
+--- a/content/common/user_agent.cc
++++ b/content/common/user_agent.cc
+@@ -79,26 +79,6 @@ std::string BuildOSCpuInfo() {
+ 
+ #if defined(OS_ANDROID)
+   std::string android_version_str = base::SysInfo::OperatingSystemVersion();
+-
+-  std::string android_info_str;
+-
+-  // Send information about the device.
+-  bool semicolon_inserted = false;
+-  std::string android_build_codename = base::SysInfo::GetAndroidBuildCodename();
+-  std::string android_device_name = base::SysInfo::HardwareModelName();
+-  if ("REL" == android_build_codename && android_device_name.size() > 0) {
+-    android_info_str += "; " + android_device_name;
+-    semicolon_inserted = true;
+-  }
+-
+-  // Append the build ID.
+-  std::string android_build_id = base::SysInfo::GetAndroidBuildID();
+-  if (android_build_id.size() > 0) {
+-    if (!semicolon_inserted) {
+-      android_info_str += ";";
+-    }
+-    android_info_str += " Build/" + android_build_id;
+-  }
+ #endif
+ 
+   base::StringAppendF(
+@@ -121,9 +101,8 @@ std::string BuildOSCpuInfo() {
+       os_minor_version,
+       os_bugfix_version
+ #elif defined(OS_ANDROID)
+-      "Android %s%s",
+-      android_version_str.c_str(),
+-      android_info_str.c_str()
++      "Android %s",
++      android_version_str.c_str()
+ #else
+       "%s %s",
+       unixinfo.sysname,  // e.g. Linux

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä