Release 74.0.3729.122

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 74.0.3729.122
+* remove more unnecessary permissions
+
 # 74.0.3729.106
 * remove account/sync menu entries (fixes https://github.com/bromite/bromite/issues/285)
 * fix failed debug builds

build/patches/Add-DuckDuckGo-Lite-search-engine.patch

@@ -316,7 +316,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Iraq
-@@ -406,7 +407,7 @@ const PrepopulatedEngine* const engines_IS[] = {
+@@ -405,7 +406,7 @@ const PrepopulatedEngine* const engines_IS[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -325,7 +325,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Italy
-@@ -414,7 +415,7 @@ const PrepopulatedEngine* const engines_IT[] = {
+@@ -413,7 +414,7 @@ const PrepopulatedEngine* const engines_IT[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -334,7 +334,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Jamaica
-@@ -422,7 +423,7 @@ const PrepopulatedEngine* const engines_JM[] = {
+@@ -421,7 +422,7 @@ const PrepopulatedEngine* const engines_JM[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -343,7 +343,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Jordan
-@@ -446,7 +447,7 @@ const PrepopulatedEngine* const engines_KE[] = {
+@@ -445,7 +446,7 @@ const PrepopulatedEngine* const engines_KE[] = {
      &googleen, &google, &startpage,
      &yahoo,
      &bing,
@@ -352,7 +352,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // South Korea
-@@ -478,14 +479,14 @@ const PrepopulatedEngine* const engines_LB[] = {
+@@ -477,14 +478,14 @@ const PrepopulatedEngine* const engines_LB[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -369,7 +369,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
  };
  
-@@ -501,7 +502,7 @@ const PrepopulatedEngine* const engines_LT[] = {
+@@ -500,7 +501,7 @@ const PrepopulatedEngine* const engines_LT[] = {
  const PrepopulatedEngine* const engines_LU[] = {
      &googleen, &google, &startpage,
      &bing,
@@ -378,7 +378,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
  };
  
-@@ -534,7 +535,7 @@ const PrepopulatedEngine* const engines_MC[] = {
+@@ -533,7 +534,7 @@ const PrepopulatedEngine* const engines_MC[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -387,7 +387,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Moldova
-@@ -542,7 +543,7 @@ const PrepopulatedEngine* const engines_MD[] = {
+@@ -541,7 +542,7 @@ const PrepopulatedEngine* const engines_MD[] = {
      &googleen, &google, &startpage,
      &yandex_ru,
      &mail_ru,
@@ -396,7 +396,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Montenegro
-@@ -558,7 +559,7 @@ const PrepopulatedEngine* const engines_MK[] = {
+@@ -557,7 +558,7 @@ const PrepopulatedEngine* const engines_MK[] = {
      &googleen, &google, &startpage,
      &yahoo,
      &bing,
@@ -405,7 +405,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Mexico
-@@ -566,7 +567,7 @@ const PrepopulatedEngine* const engines_MX[] = {
+@@ -565,7 +566,7 @@ const PrepopulatedEngine* const engines_MX[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo_mx,
@@ -414,7 +414,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Malaysia
-@@ -582,7 +583,7 @@ const PrepopulatedEngine* const engines_NI[] = {
+@@ -581,7 +582,7 @@ const PrepopulatedEngine* const engines_NI[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -423,7 +423,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Netherlands
-@@ -590,7 +591,7 @@ const PrepopulatedEngine* const engines_NL[] = {
+@@ -589,7 +590,7 @@ const PrepopulatedEngine* const engines_NL[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo_nl,
@@ -432,7 +432,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Norway
-@@ -598,14 +599,14 @@ const PrepopulatedEngine* const engines_NO[] = {
+@@ -597,14 +598,14 @@ const PrepopulatedEngine* const engines_NO[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -449,7 +449,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_nz,
  };
  
-@@ -622,7 +623,7 @@ const PrepopulatedEngine* const engines_PA[] = {
+@@ -621,7 +622,7 @@ const PrepopulatedEngine* const engines_PA[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -458,7 +458,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Peru
-@@ -630,7 +631,7 @@ const PrepopulatedEngine* const engines_PE[] = {
+@@ -629,7 +630,7 @@ const PrepopulatedEngine* const engines_PE[] = {
      &googleen, &google, &startpage,
      &yahoo_pe,
      &bing,
@@ -467,7 +467,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Philippines
-@@ -638,7 +639,7 @@ const PrepopulatedEngine* const engines_PH[] = {
+@@ -637,7 +638,7 @@ const PrepopulatedEngine* const engines_PH[] = {
      &googleen, &google, &startpage,
      &yahoo_ph,
      &bing,
@@ -476,7 +476,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Pakistan
-@@ -654,7 +655,7 @@ const PrepopulatedEngine* const engines_PL[] = {
+@@ -653,7 +654,7 @@ const PrepopulatedEngine* const engines_PL[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -485,7 +485,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Puerto Rico
-@@ -662,7 +663,7 @@ const PrepopulatedEngine* const engines_PR[] = {
+@@ -661,7 +662,7 @@ const PrepopulatedEngine* const engines_PR[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -494,7 +494,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Portugal
-@@ -670,7 +671,7 @@ const PrepopulatedEngine* const engines_PT[] = {
+@@ -669,7 +670,7 @@ const PrepopulatedEngine* const engines_PT[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -503,7 +503,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Paraguay
-@@ -678,7 +679,7 @@ const PrepopulatedEngine* const engines_PY[] = {
+@@ -677,7 +678,7 @@ const PrepopulatedEngine* const engines_PY[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -512,7 +512,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Qatar
-@@ -694,7 +695,7 @@ const PrepopulatedEngine* const engines_RO[] = {
+@@ -693,7 +694,7 @@ const PrepopulatedEngine* const engines_RO[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -521,7 +521,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Serbia
-@@ -702,7 +703,7 @@ const PrepopulatedEngine* const engines_RS[] = {
+@@ -701,7 +702,7 @@ const PrepopulatedEngine* const engines_RS[] = {
      &googleen, &google, &startpage,
      &yahoo,
      &bing,
@@ -530,7 +530,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Russia
-@@ -734,7 +735,7 @@ const PrepopulatedEngine* const engines_SE[] = {
+@@ -733,7 +734,7 @@ const PrepopulatedEngine* const engines_SE[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo_se,
@@ -539,7 +539,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Singapore
-@@ -750,7 +751,7 @@ const PrepopulatedEngine* const engines_SI[] = {
+@@ -749,7 +750,7 @@ const PrepopulatedEngine* const engines_SI[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -548,7 +548,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Slovakia
-@@ -758,7 +759,7 @@ const PrepopulatedEngine* const engines_SK[] = {
+@@ -757,7 +758,7 @@ const PrepopulatedEngine* const engines_SK[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -557,7 +557,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // El Salvador
-@@ -766,7 +767,7 @@ const PrepopulatedEngine* const engines_SV[] = {
+@@ -765,7 +766,7 @@ const PrepopulatedEngine* const engines_SV[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -566,7 +566,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Syria
-@@ -806,7 +807,7 @@ const PrepopulatedEngine* const engines_TT[] = {
+@@ -805,7 +806,7 @@ const PrepopulatedEngine* const engines_TT[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -575,7 +575,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Taiwan
-@@ -838,7 +839,7 @@ const PrepopulatedEngine* const engines_US[] = {
+@@ -837,7 +838,7 @@ const PrepopulatedEngine* const engines_US[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -584,7 +584,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Uruguay
-@@ -846,7 +847,7 @@ const PrepopulatedEngine* const engines_UY[] = {
+@@ -845,7 +846,7 @@ const PrepopulatedEngine* const engines_UY[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -593,7 +593,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Venezuela
-@@ -854,7 +855,7 @@ const PrepopulatedEngine* const engines_VE[] = {
+@@ -853,7 +854,7 @@ const PrepopulatedEngine* const engines_VE[] = {
      &googleen, &google, &startpage,
      &yahoo_ve,
      &bing,
@@ -602,7 +602,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Vietnam
-@@ -878,7 +879,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
+@@ -877,7 +878,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
      &googleen, &google, &startpage,
      &bing,
      &yahoo,
@@ -611,7 +611,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Zimbabwe
-@@ -898,7 +899,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
+@@ -897,7 +898,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
      &bing,
      &coccoc,
      &daum,

build/patches/Add-English-only-search-engine.patch

@@ -5,23 +5,14 @@ Subject: Add English-only search engine
 Add a Google search engine that forces languages to English,
 disable from all its searches RLZ and field experiments querystring parameters.
 ---
- .../search_engines/prepopulated_engines.json       |  23 ++-
+ .../search_engines/prepopulated_engines.json       |  21 ++
  components/search_engines/search_engine_type.h     |   1 +
  .../template_url_prepopulate_data.cc               | 218 ++++++++++-----------
- 3 files changed, 132 insertions(+), 110 deletions(-)
+ 3 files changed, 131 insertions(+), 109 deletions(-)
 
 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
-@@ -28,7 +28,7 @@
-     // Increment this if you change the data in ways that mean users with
-     // existing data should get a new version. Otherwise, existing data may
-     // continue to be used and updates made here will not always appear.
--    "kCurrentDataVersion": 112
-+    "kCurrentDataVersion": 113
-   },
- 
-   // The following engines are included in country lists and are added to the
 @@ -126,6 +126,27 @@
        "id": 1
      },
@@ -472,7 +463,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_ru,
-@@ -395,7 +395,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
+@@ -395,14 +395,14 @@ const PrepopulatedEngine* const engines_IQ[] = {
  
  // Iran
  const PrepopulatedEngine* const engines_IR[] = {
@@ -480,8 +471,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
 +    &googleen, &google, &startpage,
      &bing,
      &yahoo,
-     &parsijoo,
-@@ -403,7 +403,7 @@ const PrepopulatedEngine* const engines_IR[] = {
+ };
  
  // Iceland
  const PrepopulatedEngine* const engines_IS[] = {
@@ -490,7 +480,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -411,7 +411,7 @@ const PrepopulatedEngine* const engines_IS[] = {
+@@ -410,7 +410,7 @@ const PrepopulatedEngine* const engines_IS[] = {
  
  // Italy
  const PrepopulatedEngine* const engines_IT[] = {
@@ -499,7 +489,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -419,7 +419,7 @@ const PrepopulatedEngine* const engines_IT[] = {
+@@ -418,7 +418,7 @@ const PrepopulatedEngine* const engines_IT[] = {
  
  // Jamaica
  const PrepopulatedEngine* const engines_JM[] = {
@@ -508,7 +498,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -427,7 +427,7 @@ const PrepopulatedEngine* const engines_JM[] = {
+@@ -426,7 +426,7 @@ const PrepopulatedEngine* const engines_JM[] = {
  
  // Jordan
  const PrepopulatedEngine* const engines_JO[] = {
@@ -517,7 +507,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_ru,
-@@ -435,7 +435,7 @@ const PrepopulatedEngine* const engines_JO[] = {
+@@ -434,7 +434,7 @@ const PrepopulatedEngine* const engines_JO[] = {
  
  // Japan
  const PrepopulatedEngine* const engines_JP[] = {
@@ -526,7 +516,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_jp,
      &bing,
      &baidu,
-@@ -443,7 +443,7 @@ const PrepopulatedEngine* const engines_JP[] = {
+@@ -442,7 +442,7 @@ const PrepopulatedEngine* const engines_JP[] = {
  
  // Kenya
  const PrepopulatedEngine* const engines_KE[] = {
@@ -535,7 +525,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &duckduckgo,
-@@ -451,7 +451,7 @@ const PrepopulatedEngine* const engines_KE[] = {
+@@ -450,7 +450,7 @@ const PrepopulatedEngine* const engines_KE[] = {
  
  // South Korea
  const PrepopulatedEngine* const engines_KR[] = {
@@ -544,7 +534,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &naver,
      &daum,
      &bing,
-@@ -459,7 +459,7 @@ const PrepopulatedEngine* const engines_KR[] = {
+@@ -458,7 +458,7 @@ const PrepopulatedEngine* const engines_KR[] = {
  
  // Kuwait
  const PrepopulatedEngine* const engines_KW[] = {
@@ -553,7 +543,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ask,
-@@ -467,7 +467,7 @@ const PrepopulatedEngine* const engines_KW[] = {
+@@ -466,7 +466,7 @@ const PrepopulatedEngine* const engines_KW[] = {
  
  // Kazakhstan
  const PrepopulatedEngine* const engines_KZ[] = {
@@ -562,7 +552,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_kz,
      &mail_ru,
      &bing,
-@@ -475,7 +475,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
+@@ -474,7 +474,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
  
  // Lebanon
  const PrepopulatedEngine* const engines_LB[] = {
@@ -571,7 +561,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -483,7 +483,7 @@ const PrepopulatedEngine* const engines_LB[] = {
+@@ -482,7 +482,7 @@ const PrepopulatedEngine* const engines_LB[] = {
  
  // Liechtenstein
  const PrepopulatedEngine* const engines_LI[] = {
@@ -580,7 +570,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -491,7 +491,7 @@ const PrepopulatedEngine* const engines_LI[] = {
+@@ -490,7 +490,7 @@ const PrepopulatedEngine* const engines_LI[] = {
  
  // Lithuania
  const PrepopulatedEngine* const engines_LT[] = {
@@ -589,7 +579,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_ru,
-@@ -499,7 +499,7 @@ const PrepopulatedEngine* const engines_LT[] = {
+@@ -498,7 +498,7 @@ const PrepopulatedEngine* const engines_LT[] = {
  
  // Luxembourg
  const PrepopulatedEngine* const engines_LU[] = {
@@ -598,7 +588,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -507,7 +507,7 @@ const PrepopulatedEngine* const engines_LU[] = {
+@@ -506,7 +506,7 @@ const PrepopulatedEngine* const engines_LU[] = {
  
  // Latvia
  const PrepopulatedEngine* const engines_LV[] = {
@@ -607,7 +597,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yandex_ru,
      &yahoo,
-@@ -515,7 +515,7 @@ const PrepopulatedEngine* const engines_LV[] = {
+@@ -514,7 +514,7 @@ const PrepopulatedEngine* const engines_LV[] = {
  
  // Libya
  const PrepopulatedEngine* const engines_LY[] = {
@@ -616,7 +606,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_com,
-@@ -523,7 +523,7 @@ const PrepopulatedEngine* const engines_LY[] = {
+@@ -522,7 +522,7 @@ const PrepopulatedEngine* const engines_LY[] = {
  
  // Morocco
  const PrepopulatedEngine* const engines_MA[] = {
@@ -625,7 +615,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_ru,
-@@ -531,7 +531,7 @@ const PrepopulatedEngine* const engines_MA[] = {
+@@ -530,7 +530,7 @@ const PrepopulatedEngine* const engines_MA[] = {
  
  // Monaco
  const PrepopulatedEngine* const engines_MC[] = {
@@ -634,7 +624,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -539,7 +539,7 @@ const PrepopulatedEngine* const engines_MC[] = {
+@@ -538,7 +538,7 @@ const PrepopulatedEngine* const engines_MC[] = {
  
  // Moldova
  const PrepopulatedEngine* const engines_MD[] = {
@@ -643,7 +633,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
      &mail_ru,
      &duckduckgo,
-@@ -547,7 +547,7 @@ const PrepopulatedEngine* const engines_MD[] = {
+@@ -546,7 +546,7 @@ const PrepopulatedEngine* const engines_MD[] = {
  
  // Montenegro
  const PrepopulatedEngine* const engines_ME[] = {
@@ -652,7 +642,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_ru,
-@@ -555,7 +555,7 @@ const PrepopulatedEngine* const engines_ME[] = {
+@@ -554,7 +554,7 @@ const PrepopulatedEngine* const engines_ME[] = {
  
  // Macedonia
  const PrepopulatedEngine* const engines_MK[] = {
@@ -661,7 +651,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &duckduckgo,
-@@ -563,7 +563,7 @@ const PrepopulatedEngine* const engines_MK[] = {
+@@ -562,7 +562,7 @@ const PrepopulatedEngine* const engines_MK[] = {
  
  // Mexico
  const PrepopulatedEngine* const engines_MX[] = {
@@ -670,7 +660,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_mx,
      &duckduckgo,
-@@ -571,7 +571,7 @@ const PrepopulatedEngine* const engines_MX[] = {
+@@ -570,7 +570,7 @@ const PrepopulatedEngine* const engines_MX[] = {
  
  // Malaysia
  const PrepopulatedEngine* const engines_MY[] = {
@@ -679,7 +669,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_my,
      &bing,
      &baidu,
-@@ -579,7 +579,7 @@ const PrepopulatedEngine* const engines_MY[] = {
+@@ -578,7 +578,7 @@ const PrepopulatedEngine* const engines_MY[] = {
  
  // Nicaragua
  const PrepopulatedEngine* const engines_NI[] = {
@@ -688,7 +678,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -587,7 +587,7 @@ const PrepopulatedEngine* const engines_NI[] = {
+@@ -586,7 +586,7 @@ const PrepopulatedEngine* const engines_NI[] = {
  
  // Netherlands
  const PrepopulatedEngine* const engines_NL[] = {
@@ -697,7 +687,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_nl,
      &duckduckgo,
-@@ -595,7 +595,7 @@ const PrepopulatedEngine* const engines_NL[] = {
+@@ -594,7 +594,7 @@ const PrepopulatedEngine* const engines_NL[] = {
  
  // Norway
  const PrepopulatedEngine* const engines_NO[] = {
@@ -706,7 +696,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -603,7 +603,7 @@ const PrepopulatedEngine* const engines_NO[] = {
+@@ -602,7 +602,7 @@ const PrepopulatedEngine* const engines_NO[] = {
  
  // New Zealand
  const PrepopulatedEngine* const engines_NZ[] = {
@@ -715,7 +705,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo_nz,
-@@ -611,7 +611,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
+@@ -610,7 +610,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
  
  // Oman
  const PrepopulatedEngine* const engines_OM[] = {
@@ -724,7 +714,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ask,
-@@ -619,7 +619,7 @@ const PrepopulatedEngine* const engines_OM[] = {
+@@ -618,7 +618,7 @@ const PrepopulatedEngine* const engines_OM[] = {
  
  // Panama
  const PrepopulatedEngine* const engines_PA[] = {
@@ -733,7 +723,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -627,7 +627,7 @@ const PrepopulatedEngine* const engines_PA[] = {
+@@ -626,7 +626,7 @@ const PrepopulatedEngine* const engines_PA[] = {
  
  // Peru
  const PrepopulatedEngine* const engines_PE[] = {
@@ -742,7 +732,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_pe,
      &bing,
      &duckduckgo,
-@@ -635,7 +635,7 @@ const PrepopulatedEngine* const engines_PE[] = {
+@@ -634,7 +634,7 @@ const PrepopulatedEngine* const engines_PE[] = {
  
  // Philippines
  const PrepopulatedEngine* const engines_PH[] = {
@@ -751,7 +741,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_ph,
      &bing,
      &duckduckgo,
-@@ -643,7 +643,7 @@ const PrepopulatedEngine* const engines_PH[] = {
+@@ -642,7 +642,7 @@ const PrepopulatedEngine* const engines_PH[] = {
  
  // Pakistan
  const PrepopulatedEngine* const engines_PK[] = {
@@ -760,7 +750,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &baidu,
-@@ -651,7 +651,7 @@ const PrepopulatedEngine* const engines_PK[] = {
+@@ -650,7 +650,7 @@ const PrepopulatedEngine* const engines_PK[] = {
  
  // Poland
  const PrepopulatedEngine* const engines_PL[] = {
@@ -769,7 +759,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -659,7 +659,7 @@ const PrepopulatedEngine* const engines_PL[] = {
+@@ -658,7 +658,7 @@ const PrepopulatedEngine* const engines_PL[] = {
  
  // Puerto Rico
  const PrepopulatedEngine* const engines_PR[] = {
@@ -778,7 +768,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -667,7 +667,7 @@ const PrepopulatedEngine* const engines_PR[] = {
+@@ -666,7 +666,7 @@ const PrepopulatedEngine* const engines_PR[] = {
  
  // Portugal
  const PrepopulatedEngine* const engines_PT[] = {
@@ -787,7 +777,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -675,7 +675,7 @@ const PrepopulatedEngine* const engines_PT[] = {
+@@ -674,7 +674,7 @@ const PrepopulatedEngine* const engines_PT[] = {
  
  // Paraguay
  const PrepopulatedEngine* const engines_PY[] = {
@@ -796,7 +786,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -683,7 +683,7 @@ const PrepopulatedEngine* const engines_PY[] = {
+@@ -682,7 +682,7 @@ const PrepopulatedEngine* const engines_PY[] = {
  
  // Qatar
  const PrepopulatedEngine* const engines_QA[] = {
@@ -805,7 +795,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ask,
-@@ -691,7 +691,7 @@ const PrepopulatedEngine* const engines_QA[] = {
+@@ -690,7 +690,7 @@ const PrepopulatedEngine* const engines_QA[] = {
  
  // Romania
  const PrepopulatedEngine* const engines_RO[] = {
@@ -814,7 +804,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -699,7 +699,7 @@ const PrepopulatedEngine* const engines_RO[] = {
+@@ -698,7 +698,7 @@ const PrepopulatedEngine* const engines_RO[] = {
  
  // Serbia
  const PrepopulatedEngine* const engines_RS[] = {
@@ -823,7 +813,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &duckduckgo,
-@@ -708,14 +708,14 @@ const PrepopulatedEngine* const engines_RS[] = {
+@@ -707,14 +707,14 @@ const PrepopulatedEngine* const engines_RS[] = {
  // Russia
  const PrepopulatedEngine* const engines_RU[] = {
      &yandex_ru,
@@ -840,7 +830,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_ru,
-@@ -723,7 +723,7 @@ const PrepopulatedEngine* const engines_RW[] = {
+@@ -722,7 +722,7 @@ const PrepopulatedEngine* const engines_RW[] = {
  
  // Saudi Arabia
  const PrepopulatedEngine* const engines_SA[] = {
@@ -849,7 +839,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_com,
-@@ -731,7 +731,7 @@ const PrepopulatedEngine* const engines_SA[] = {
+@@ -730,7 +730,7 @@ const PrepopulatedEngine* const engines_SA[] = {
  
  // Sweden
  const PrepopulatedEngine* const engines_SE[] = {
@@ -858,7 +848,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_se,
      &duckduckgo,
-@@ -739,7 +739,7 @@ const PrepopulatedEngine* const engines_SE[] = {
+@@ -738,7 +738,7 @@ const PrepopulatedEngine* const engines_SE[] = {
  
  // Singapore
  const PrepopulatedEngine* const engines_SG[] = {
@@ -867,7 +857,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_sg,
      &yandex_com,
-@@ -747,7 +747,7 @@ const PrepopulatedEngine* const engines_SG[] = {
+@@ -746,7 +746,7 @@ const PrepopulatedEngine* const engines_SG[] = {
  
  // Slovenia
  const PrepopulatedEngine* const engines_SI[] = {
@@ -876,7 +866,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -755,7 +755,7 @@ const PrepopulatedEngine* const engines_SI[] = {
+@@ -754,7 +754,7 @@ const PrepopulatedEngine* const engines_SI[] = {
  
  // Slovakia
  const PrepopulatedEngine* const engines_SK[] = {
@@ -885,7 +875,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -763,7 +763,7 @@ const PrepopulatedEngine* const engines_SK[] = {
+@@ -762,7 +762,7 @@ const PrepopulatedEngine* const engines_SK[] = {
  
  // El Salvador
  const PrepopulatedEngine* const engines_SV[] = {
@@ -894,7 +884,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -771,7 +771,7 @@ const PrepopulatedEngine* const engines_SV[] = {
+@@ -770,7 +770,7 @@ const PrepopulatedEngine* const engines_SV[] = {
  
  // Syria
  const PrepopulatedEngine* const engines_SY[] = {
@@ -903,7 +893,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_ru,
-@@ -779,7 +779,7 @@ const PrepopulatedEngine* const engines_SY[] = {
+@@ -778,7 +778,7 @@ const PrepopulatedEngine* const engines_SY[] = {
  
  // Thailand
  const PrepopulatedEngine* const engines_TH[] = {
@@ -912,7 +902,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_th,
      &bing,
      &ask,
-@@ -787,7 +787,7 @@ const PrepopulatedEngine* const engines_TH[] = {
+@@ -786,7 +786,7 @@ const PrepopulatedEngine* const engines_TH[] = {
  
  // Tunisia
  const PrepopulatedEngine* const engines_TN[] = {
@@ -921,7 +911,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_ru,
-@@ -795,7 +795,7 @@ const PrepopulatedEngine* const engines_TN[] = {
+@@ -794,7 +794,7 @@ const PrepopulatedEngine* const engines_TN[] = {
  
  // Turkey
  const PrepopulatedEngine* const engines_TR[] = {
@@ -930,7 +920,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_tr,
      &yahoo_tr,
      &bing,
-@@ -803,7 +803,7 @@ const PrepopulatedEngine* const engines_TR[] = {
+@@ -802,7 +802,7 @@ const PrepopulatedEngine* const engines_TR[] = {
  
  // Trinidad and Tobago
  const PrepopulatedEngine* const engines_TT[] = {
@@ -939,7 +929,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -811,7 +811,7 @@ const PrepopulatedEngine* const engines_TT[] = {
+@@ -810,7 +810,7 @@ const PrepopulatedEngine* const engines_TT[] = {
  
  // Taiwan
  const PrepopulatedEngine* const engines_TW[] = {
@@ -948,7 +938,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_tw,
      &bing,
      &baidu,
-@@ -819,7 +819,7 @@ const PrepopulatedEngine* const engines_TW[] = {
+@@ -818,7 +818,7 @@ const PrepopulatedEngine* const engines_TW[] = {
  
  // Tanzania
  const PrepopulatedEngine* const engines_TZ[] = {
@@ -957,7 +947,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_ru,
-@@ -827,7 +827,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
+@@ -826,7 +826,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
  
  // Ukraine
  const PrepopulatedEngine* const engines_UA[] = {
@@ -966,7 +956,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ua,
      &mail_ru,
      &bing,
-@@ -835,7 +835,7 @@ const PrepopulatedEngine* const engines_UA[] = {
+@@ -834,7 +834,7 @@ const PrepopulatedEngine* const engines_UA[] = {
  
  // United States
  const PrepopulatedEngine* const engines_US[] = {
@@ -975,7 +965,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -843,7 +843,7 @@ const PrepopulatedEngine* const engines_US[] = {
+@@ -842,7 +842,7 @@ const PrepopulatedEngine* const engines_US[] = {
  
  // Uruguay
  const PrepopulatedEngine* const engines_UY[] = {
@@ -984,7 +974,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -851,7 +851,7 @@ const PrepopulatedEngine* const engines_UY[] = {
+@@ -850,7 +850,7 @@ const PrepopulatedEngine* const engines_UY[] = {
  
  // Venezuela
  const PrepopulatedEngine* const engines_VE[] = {
@@ -993,7 +983,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_ve,
      &bing,
      &duckduckgo,
-@@ -859,7 +859,7 @@ const PrepopulatedEngine* const engines_VE[] = {
+@@ -858,7 +858,7 @@ const PrepopulatedEngine* const engines_VE[] = {
  
  // Vietnam
  const PrepopulatedEngine* const engines_VN[] = {
@@ -1002,7 +992,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &coccoc,
      &bing,
      &yahoo_vn,
-@@ -867,7 +867,7 @@ const PrepopulatedEngine* const engines_VN[] = {
+@@ -866,7 +866,7 @@ const PrepopulatedEngine* const engines_VN[] = {
  
  // Yemen
  const PrepopulatedEngine* const engines_YE[] = {
@@ -1011,7 +1001,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &baidu,
-@@ -875,7 +875,7 @@ const PrepopulatedEngine* const engines_YE[] = {
+@@ -874,7 +874,7 @@ const PrepopulatedEngine* const engines_YE[] = {
  
  // South Africa
  const PrepopulatedEngine* const engines_ZA[] = {
@@ -1020,7 +1010,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -883,7 +883,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
+@@ -882,7 +882,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
  
  // Zimbabwe
  const PrepopulatedEngine* const engines_ZW[] = {
@@ -1029,7 +1019,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &baidu,
-@@ -899,7 +899,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
+@@ -898,7 +898,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
      &coccoc,
      &daum,
      &duckduckgo,
@@ -1037,7 +1027,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
 +    &googleen, &google, &startpage,
      &mail_ru,
      &naver,
-     &parsijoo,
+     &qwant,
 -- 
 2.11.0
 

build/patches/Add-Qwant-search-engine.patch

@@ -21,7 +21,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
-@@ -196,6 +196,7 @@
+@@ -187,6 +187,7 @@
        "favicon_url": "https://www.qwant.com/favicon.ico",
        "search_url": "https://www.qwant.com/?q={searchTerms}&client=opensearch",
        "suggest_url": "https://api.qwant.com/api/suggest/?q={searchTerms}&client=opensearch",
@@ -440,7 +440,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_ru,
-@@ -396,7 +396,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
+@@ -396,14 +396,14 @@ const PrepopulatedEngine* const engines_IQ[] = {
  
  // Iran
  const PrepopulatedEngine* const engines_IR[] = {
@@ -448,8 +448,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
 +    &googleen, &google, &startpage, &qwant,
      &bing,
      &yahoo,
-     &parsijoo,
-@@ -404,7 +404,7 @@ const PrepopulatedEngine* const engines_IR[] = {
+ };
  
  // Iceland
  const PrepopulatedEngine* const engines_IS[] = {
@@ -458,7 +457,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -412,7 +412,7 @@ const PrepopulatedEngine* const engines_IS[] = {
+@@ -411,7 +411,7 @@ const PrepopulatedEngine* const engines_IS[] = {
  
  // Italy
  const PrepopulatedEngine* const engines_IT[] = {
@@ -467,7 +466,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -420,7 +420,7 @@ const PrepopulatedEngine* const engines_IT[] = {
+@@ -419,7 +419,7 @@ const PrepopulatedEngine* const engines_IT[] = {
  
  // Jamaica
  const PrepopulatedEngine* const engines_JM[] = {
@@ -476,7 +475,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -428,7 +428,7 @@ const PrepopulatedEngine* const engines_JM[] = {
+@@ -427,7 +427,7 @@ const PrepopulatedEngine* const engines_JM[] = {
  
  // Jordan
  const PrepopulatedEngine* const engines_JO[] = {
@@ -485,7 +484,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_ru,
-@@ -436,7 +436,7 @@ const PrepopulatedEngine* const engines_JO[] = {
+@@ -435,7 +435,7 @@ const PrepopulatedEngine* const engines_JO[] = {
  
  // Japan
  const PrepopulatedEngine* const engines_JP[] = {
@@ -494,7 +493,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_jp,
      &bing,
      &baidu,
-@@ -444,7 +444,7 @@ const PrepopulatedEngine* const engines_JP[] = {
+@@ -443,7 +443,7 @@ const PrepopulatedEngine* const engines_JP[] = {
  
  // Kenya
  const PrepopulatedEngine* const engines_KE[] = {
@@ -503,7 +502,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &duckduckgo, &duckduckgo_light,
-@@ -452,7 +452,7 @@ const PrepopulatedEngine* const engines_KE[] = {
+@@ -451,7 +451,7 @@ const PrepopulatedEngine* const engines_KE[] = {
  
  // South Korea
  const PrepopulatedEngine* const engines_KR[] = {
@@ -512,7 +511,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &naver,
      &daum,
      &bing,
-@@ -460,7 +460,7 @@ const PrepopulatedEngine* const engines_KR[] = {
+@@ -459,7 +459,7 @@ const PrepopulatedEngine* const engines_KR[] = {
  
  // Kuwait
  const PrepopulatedEngine* const engines_KW[] = {
@@ -521,7 +520,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ask,
-@@ -468,7 +468,7 @@ const PrepopulatedEngine* const engines_KW[] = {
+@@ -467,7 +467,7 @@ const PrepopulatedEngine* const engines_KW[] = {
  
  // Kazakhstan
  const PrepopulatedEngine* const engines_KZ[] = {
@@ -530,7 +529,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_kz,
      &mail_ru,
      &bing,
-@@ -476,7 +476,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
+@@ -475,7 +475,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
  
  // Lebanon
  const PrepopulatedEngine* const engines_LB[] = {
@@ -539,7 +538,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -484,7 +484,7 @@ const PrepopulatedEngine* const engines_LB[] = {
+@@ -483,7 +483,7 @@ const PrepopulatedEngine* const engines_LB[] = {
  
  // Liechtenstein
  const PrepopulatedEngine* const engines_LI[] = {
@@ -548,7 +547,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo, &duckduckgo_light,
      &yahoo,
-@@ -492,7 +492,7 @@ const PrepopulatedEngine* const engines_LI[] = {
+@@ -491,7 +491,7 @@ const PrepopulatedEngine* const engines_LI[] = {
  
  // Lithuania
  const PrepopulatedEngine* const engines_LT[] = {
@@ -557,7 +556,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_ru,
-@@ -500,7 +500,7 @@ const PrepopulatedEngine* const engines_LT[] = {
+@@ -499,7 +499,7 @@ const PrepopulatedEngine* const engines_LT[] = {
  
  // Luxembourg
  const PrepopulatedEngine* const engines_LU[] = {
@@ -566,7 +565,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo, &duckduckgo_light,
      &yahoo,
-@@ -508,7 +508,7 @@ const PrepopulatedEngine* const engines_LU[] = {
+@@ -507,7 +507,7 @@ const PrepopulatedEngine* const engines_LU[] = {
  
  // Latvia
  const PrepopulatedEngine* const engines_LV[] = {
@@ -575,7 +574,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yandex_ru,
      &yahoo,
-@@ -516,7 +516,7 @@ const PrepopulatedEngine* const engines_LV[] = {
+@@ -515,7 +515,7 @@ const PrepopulatedEngine* const engines_LV[] = {
  
  // Libya
  const PrepopulatedEngine* const engines_LY[] = {
@@ -584,7 +583,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_com,
-@@ -524,7 +524,7 @@ const PrepopulatedEngine* const engines_LY[] = {
+@@ -523,7 +523,7 @@ const PrepopulatedEngine* const engines_LY[] = {
  
  // Morocco
  const PrepopulatedEngine* const engines_MA[] = {
@@ -593,7 +592,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_ru,
-@@ -532,7 +532,7 @@ const PrepopulatedEngine* const engines_MA[] = {
+@@ -531,7 +531,7 @@ const PrepopulatedEngine* const engines_MA[] = {
  
  // Monaco
  const PrepopulatedEngine* const engines_MC[] = {
@@ -602,7 +601,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -540,7 +540,7 @@ const PrepopulatedEngine* const engines_MC[] = {
+@@ -539,7 +539,7 @@ const PrepopulatedEngine* const engines_MC[] = {
  
  // Moldova
  const PrepopulatedEngine* const engines_MD[] = {
@@ -611,7 +610,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
      &mail_ru,
      &duckduckgo, &duckduckgo_light,
-@@ -548,7 +548,7 @@ const PrepopulatedEngine* const engines_MD[] = {
+@@ -547,7 +547,7 @@ const PrepopulatedEngine* const engines_MD[] = {
  
  // Montenegro
  const PrepopulatedEngine* const engines_ME[] = {
@@ -620,7 +619,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_ru,
-@@ -556,7 +556,7 @@ const PrepopulatedEngine* const engines_ME[] = {
+@@ -555,7 +555,7 @@ const PrepopulatedEngine* const engines_ME[] = {
  
  // Macedonia
  const PrepopulatedEngine* const engines_MK[] = {
@@ -629,7 +628,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &duckduckgo, &duckduckgo_light,
-@@ -564,7 +564,7 @@ const PrepopulatedEngine* const engines_MK[] = {
+@@ -563,7 +563,7 @@ const PrepopulatedEngine* const engines_MK[] = {
  
  // Mexico
  const PrepopulatedEngine* const engines_MX[] = {
@@ -638,7 +637,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_mx,
      &duckduckgo, &duckduckgo_light,
-@@ -572,7 +572,7 @@ const PrepopulatedEngine* const engines_MX[] = {
+@@ -571,7 +571,7 @@ const PrepopulatedEngine* const engines_MX[] = {
  
  // Malaysia
  const PrepopulatedEngine* const engines_MY[] = {
@@ -647,7 +646,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_my,
      &bing,
      &baidu,
-@@ -580,7 +580,7 @@ const PrepopulatedEngine* const engines_MY[] = {
+@@ -579,7 +579,7 @@ const PrepopulatedEngine* const engines_MY[] = {
  
  // Nicaragua
  const PrepopulatedEngine* const engines_NI[] = {
@@ -656,7 +655,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -588,7 +588,7 @@ const PrepopulatedEngine* const engines_NI[] = {
+@@ -587,7 +587,7 @@ const PrepopulatedEngine* const engines_NI[] = {
  
  // Netherlands
  const PrepopulatedEngine* const engines_NL[] = {
@@ -665,7 +664,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_nl,
      &duckduckgo, &duckduckgo_light,
-@@ -596,7 +596,7 @@ const PrepopulatedEngine* const engines_NL[] = {
+@@ -595,7 +595,7 @@ const PrepopulatedEngine* const engines_NL[] = {
  
  // Norway
  const PrepopulatedEngine* const engines_NO[] = {
@@ -674,7 +673,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -604,7 +604,7 @@ const PrepopulatedEngine* const engines_NO[] = {
+@@ -603,7 +603,7 @@ const PrepopulatedEngine* const engines_NO[] = {
  
  // New Zealand
  const PrepopulatedEngine* const engines_NZ[] = {
@@ -683,7 +682,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo, &duckduckgo_light,
      &yahoo_nz,
-@@ -612,7 +612,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
+@@ -611,7 +611,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
  
  // Oman
  const PrepopulatedEngine* const engines_OM[] = {
@@ -692,7 +691,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ask,
-@@ -620,7 +620,7 @@ const PrepopulatedEngine* const engines_OM[] = {
+@@ -619,7 +619,7 @@ const PrepopulatedEngine* const engines_OM[] = {
  
  // Panama
  const PrepopulatedEngine* const engines_PA[] = {
@@ -701,7 +700,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -628,7 +628,7 @@ const PrepopulatedEngine* const engines_PA[] = {
+@@ -627,7 +627,7 @@ const PrepopulatedEngine* const engines_PA[] = {
  
  // Peru
  const PrepopulatedEngine* const engines_PE[] = {
@@ -710,7 +709,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_pe,
      &bing,
      &duckduckgo, &duckduckgo_light,
-@@ -636,7 +636,7 @@ const PrepopulatedEngine* const engines_PE[] = {
+@@ -635,7 +635,7 @@ const PrepopulatedEngine* const engines_PE[] = {
  
  // Philippines
  const PrepopulatedEngine* const engines_PH[] = {
@@ -719,7 +718,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_ph,
      &bing,
      &duckduckgo, &duckduckgo_light,
-@@ -644,7 +644,7 @@ const PrepopulatedEngine* const engines_PH[] = {
+@@ -643,7 +643,7 @@ const PrepopulatedEngine* const engines_PH[] = {
  
  // Pakistan
  const PrepopulatedEngine* const engines_PK[] = {
@@ -728,7 +727,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &baidu,
-@@ -652,7 +652,7 @@ const PrepopulatedEngine* const engines_PK[] = {
+@@ -651,7 +651,7 @@ const PrepopulatedEngine* const engines_PK[] = {
  
  // Poland
  const PrepopulatedEngine* const engines_PL[] = {
@@ -737,7 +736,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -660,7 +660,7 @@ const PrepopulatedEngine* const engines_PL[] = {
+@@ -659,7 +659,7 @@ const PrepopulatedEngine* const engines_PL[] = {
  
  // Puerto Rico
  const PrepopulatedEngine* const engines_PR[] = {
@@ -746,7 +745,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -668,7 +668,7 @@ const PrepopulatedEngine* const engines_PR[] = {
+@@ -667,7 +667,7 @@ const PrepopulatedEngine* const engines_PR[] = {
  
  // Portugal
  const PrepopulatedEngine* const engines_PT[] = {
@@ -755,7 +754,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -676,7 +676,7 @@ const PrepopulatedEngine* const engines_PT[] = {
+@@ -675,7 +675,7 @@ const PrepopulatedEngine* const engines_PT[] = {
  
  // Paraguay
  const PrepopulatedEngine* const engines_PY[] = {
@@ -764,7 +763,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -684,7 +684,7 @@ const PrepopulatedEngine* const engines_PY[] = {
+@@ -683,7 +683,7 @@ const PrepopulatedEngine* const engines_PY[] = {
  
  // Qatar
  const PrepopulatedEngine* const engines_QA[] = {
@@ -773,7 +772,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ask,
-@@ -692,7 +692,7 @@ const PrepopulatedEngine* const engines_QA[] = {
+@@ -691,7 +691,7 @@ const PrepopulatedEngine* const engines_QA[] = {
  
  // Romania
  const PrepopulatedEngine* const engines_RO[] = {
@@ -782,7 +781,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -700,7 +700,7 @@ const PrepopulatedEngine* const engines_RO[] = {
+@@ -699,7 +699,7 @@ const PrepopulatedEngine* const engines_RO[] = {
  
  // Serbia
  const PrepopulatedEngine* const engines_RS[] = {
@@ -791,7 +790,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &duckduckgo, &duckduckgo_light,
-@@ -709,14 +709,14 @@ const PrepopulatedEngine* const engines_RS[] = {
+@@ -708,14 +708,14 @@ const PrepopulatedEngine* const engines_RS[] = {
  // Russia
  const PrepopulatedEngine* const engines_RU[] = {
      &yandex_ru,
@@ -808,7 +807,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_ru,
-@@ -724,7 +724,7 @@ const PrepopulatedEngine* const engines_RW[] = {
+@@ -723,7 +723,7 @@ const PrepopulatedEngine* const engines_RW[] = {
  
  // Saudi Arabia
  const PrepopulatedEngine* const engines_SA[] = {
@@ -817,7 +816,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_com,
-@@ -732,7 +732,7 @@ const PrepopulatedEngine* const engines_SA[] = {
+@@ -731,7 +731,7 @@ const PrepopulatedEngine* const engines_SA[] = {
  
  // Sweden
  const PrepopulatedEngine* const engines_SE[] = {
@@ -826,7 +825,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_se,
      &duckduckgo, &duckduckgo_light,
-@@ -740,7 +740,7 @@ const PrepopulatedEngine* const engines_SE[] = {
+@@ -739,7 +739,7 @@ const PrepopulatedEngine* const engines_SE[] = {
  
  // Singapore
  const PrepopulatedEngine* const engines_SG[] = {
@@ -835,7 +834,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_sg,
      &yandex_com,
-@@ -748,7 +748,7 @@ const PrepopulatedEngine* const engines_SG[] = {
+@@ -747,7 +747,7 @@ const PrepopulatedEngine* const engines_SG[] = {
  
  // Slovenia
  const PrepopulatedEngine* const engines_SI[] = {
@@ -844,7 +843,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -756,7 +756,7 @@ const PrepopulatedEngine* const engines_SI[] = {
+@@ -755,7 +755,7 @@ const PrepopulatedEngine* const engines_SI[] = {
  
  // Slovakia
  const PrepopulatedEngine* const engines_SK[] = {
@@ -853,7 +852,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -764,7 +764,7 @@ const PrepopulatedEngine* const engines_SK[] = {
+@@ -763,7 +763,7 @@ const PrepopulatedEngine* const engines_SK[] = {
  
  // El Salvador
  const PrepopulatedEngine* const engines_SV[] = {
@@ -862,7 +861,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -772,7 +772,7 @@ const PrepopulatedEngine* const engines_SV[] = {
+@@ -771,7 +771,7 @@ const PrepopulatedEngine* const engines_SV[] = {
  
  // Syria
  const PrepopulatedEngine* const engines_SY[] = {
@@ -871,7 +870,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_ru,
-@@ -780,7 +780,7 @@ const PrepopulatedEngine* const engines_SY[] = {
+@@ -779,7 +779,7 @@ const PrepopulatedEngine* const engines_SY[] = {
  
  // Thailand
  const PrepopulatedEngine* const engines_TH[] = {
@@ -880,7 +879,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_th,
      &bing,
      &ask,
-@@ -788,7 +788,7 @@ const PrepopulatedEngine* const engines_TH[] = {
+@@ -787,7 +787,7 @@ const PrepopulatedEngine* const engines_TH[] = {
  
  // Tunisia
  const PrepopulatedEngine* const engines_TN[] = {
@@ -889,7 +888,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_ru,
-@@ -796,7 +796,7 @@ const PrepopulatedEngine* const engines_TN[] = {
+@@ -795,7 +795,7 @@ const PrepopulatedEngine* const engines_TN[] = {
  
  // Turkey
  const PrepopulatedEngine* const engines_TR[] = {
@@ -898,7 +897,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_tr,
      &yahoo_tr,
      &bing,
-@@ -804,7 +804,7 @@ const PrepopulatedEngine* const engines_TR[] = {
+@@ -803,7 +803,7 @@ const PrepopulatedEngine* const engines_TR[] = {
  
  // Trinidad and Tobago
  const PrepopulatedEngine* const engines_TT[] = {
@@ -907,7 +906,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -812,7 +812,7 @@ const PrepopulatedEngine* const engines_TT[] = {
+@@ -811,7 +811,7 @@ const PrepopulatedEngine* const engines_TT[] = {
  
  // Taiwan
  const PrepopulatedEngine* const engines_TW[] = {
@@ -916,7 +915,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_tw,
      &bing,
      &baidu,
-@@ -820,7 +820,7 @@ const PrepopulatedEngine* const engines_TW[] = {
+@@ -819,7 +819,7 @@ const PrepopulatedEngine* const engines_TW[] = {
  
  // Tanzania
  const PrepopulatedEngine* const engines_TZ[] = {
@@ -925,7 +924,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_ru,
-@@ -828,7 +828,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
+@@ -827,7 +827,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
  
  // Ukraine
  const PrepopulatedEngine* const engines_UA[] = {
@@ -934,7 +933,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ua,
      &mail_ru,
      &bing,
-@@ -836,7 +836,7 @@ const PrepopulatedEngine* const engines_UA[] = {
+@@ -835,7 +835,7 @@ const PrepopulatedEngine* const engines_UA[] = {
  
  // United States
  const PrepopulatedEngine* const engines_US[] = {
@@ -943,7 +942,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -844,7 +844,7 @@ const PrepopulatedEngine* const engines_US[] = {
+@@ -843,7 +843,7 @@ const PrepopulatedEngine* const engines_US[] = {
  
  // Uruguay
  const PrepopulatedEngine* const engines_UY[] = {
@@ -952,7 +951,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -852,7 +852,7 @@ const PrepopulatedEngine* const engines_UY[] = {
+@@ -851,7 +851,7 @@ const PrepopulatedEngine* const engines_UY[] = {
  
  // Venezuela
  const PrepopulatedEngine* const engines_VE[] = {
@@ -961,7 +960,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_ve,
      &bing,
      &duckduckgo, &duckduckgo_light,
-@@ -860,7 +860,7 @@ const PrepopulatedEngine* const engines_VE[] = {
+@@ -859,7 +859,7 @@ const PrepopulatedEngine* const engines_VE[] = {
  
  // Vietnam
  const PrepopulatedEngine* const engines_VN[] = {
@@ -970,7 +969,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &coccoc,
      &bing,
      &yahoo_vn,
-@@ -868,7 +868,7 @@ const PrepopulatedEngine* const engines_VN[] = {
+@@ -867,7 +867,7 @@ const PrepopulatedEngine* const engines_VN[] = {
  
  // Yemen
  const PrepopulatedEngine* const engines_YE[] = {
@@ -979,7 +978,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &baidu,
-@@ -876,7 +876,7 @@ const PrepopulatedEngine* const engines_YE[] = {
+@@ -875,7 +875,7 @@ const PrepopulatedEngine* const engines_YE[] = {
  
  // South Africa
  const PrepopulatedEngine* const engines_ZA[] = {
@@ -988,7 +987,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo, &duckduckgo_light,
-@@ -884,7 +884,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
+@@ -883,7 +883,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
  
  // Zimbabwe
  const PrepopulatedEngine* const engines_ZW[] = {
@@ -997,7 +996,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &baidu,
-@@ -900,7 +900,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
+@@ -899,7 +899,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
      &coccoc,
      &daum,
      &duckduckgo, &duckduckgo_light,
@@ -1005,7 +1004,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
 +    &googleen, &google, &startpage, &qwant,
      &mail_ru,
      &naver,
-     &parsijoo,
+     &qwant,
 -- 
 2.11.0
 

build/patches/Add-StartPage-search-engine.patch

@@ -3,24 +3,15 @@ Date: Wed, 18 Oct 2017 21:24:05 +0200
 Subject: Add StartPage search engine
 
 ---
- .../search_engines/prepopulated_engines.json       |  12 +-
+ .../search_engines/prepopulated_engines.json       |  10 +
  components/search_engines/search_engine_type.h     |   1 +
  .../template_url_prepopulate_data.cc               | 218 ++++++++++-----------
- 3 files changed, 121 insertions(+), 110 deletions(-)
+ 3 files changed, 120 insertions(+), 109 deletions(-)
 
 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
-@@ -28,7 +28,7 @@
-     // Increment this if you change the data in ways that mean users with
-     // existing data should get a new version. Otherwise, existing data may
-     // continue to be used and updates made here will not always appear.
--    "kCurrentDataVersion": 111
-+    "kCurrentDataVersion": 112
-   },
- 
-   // The following engines are included in country lists and are added to the
-@@ -206,6 +206,16 @@
+@@ -197,6 +197,16 @@
        "id": 56
      },
  
@@ -459,7 +450,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_ru,
-@@ -395,7 +395,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
+@@ -395,14 +395,14 @@ const PrepopulatedEngine* const engines_IQ[] = {
  
  // Iran
  const PrepopulatedEngine* const engines_IR[] = {
@@ -467,8 +458,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
 +    &google, &startpage,
      &bing,
      &yahoo,
-     &parsijoo,
-@@ -403,7 +403,7 @@ const PrepopulatedEngine* const engines_IR[] = {
+ };
  
  // Iceland
  const PrepopulatedEngine* const engines_IS[] = {
@@ -477,7 +467,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -411,7 +411,7 @@ const PrepopulatedEngine* const engines_IS[] = {
+@@ -410,7 +410,7 @@ const PrepopulatedEngine* const engines_IS[] = {
  
  // Italy
  const PrepopulatedEngine* const engines_IT[] = {
@@ -486,7 +476,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -419,7 +419,7 @@ const PrepopulatedEngine* const engines_IT[] = {
+@@ -418,7 +418,7 @@ const PrepopulatedEngine* const engines_IT[] = {
  
  // Jamaica
  const PrepopulatedEngine* const engines_JM[] = {
@@ -495,7 +485,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -427,7 +427,7 @@ const PrepopulatedEngine* const engines_JM[] = {
+@@ -426,7 +426,7 @@ const PrepopulatedEngine* const engines_JM[] = {
  
  // Jordan
  const PrepopulatedEngine* const engines_JO[] = {
@@ -504,7 +494,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_ru,
-@@ -435,7 +435,7 @@ const PrepopulatedEngine* const engines_JO[] = {
+@@ -434,7 +434,7 @@ const PrepopulatedEngine* const engines_JO[] = {
  
  // Japan
  const PrepopulatedEngine* const engines_JP[] = {
@@ -513,7 +503,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_jp,
      &bing,
      &baidu,
-@@ -443,7 +443,7 @@ const PrepopulatedEngine* const engines_JP[] = {
+@@ -442,7 +442,7 @@ const PrepopulatedEngine* const engines_JP[] = {
  
  // Kenya
  const PrepopulatedEngine* const engines_KE[] = {
@@ -522,7 +512,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &duckduckgo,
-@@ -451,7 +451,7 @@ const PrepopulatedEngine* const engines_KE[] = {
+@@ -450,7 +450,7 @@ const PrepopulatedEngine* const engines_KE[] = {
  
  // South Korea
  const PrepopulatedEngine* const engines_KR[] = {
@@ -531,7 +521,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &naver,
      &daum,
      &bing,
-@@ -459,7 +459,7 @@ const PrepopulatedEngine* const engines_KR[] = {
+@@ -458,7 +458,7 @@ const PrepopulatedEngine* const engines_KR[] = {
  
  // Kuwait
  const PrepopulatedEngine* const engines_KW[] = {
@@ -540,7 +530,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ask,
-@@ -467,7 +467,7 @@ const PrepopulatedEngine* const engines_KW[] = {
+@@ -466,7 +466,7 @@ const PrepopulatedEngine* const engines_KW[] = {
  
  // Kazakhstan
  const PrepopulatedEngine* const engines_KZ[] = {
@@ -549,7 +539,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_kz,
      &mail_ru,
      &bing,
-@@ -475,7 +475,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
+@@ -474,7 +474,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
  
  // Lebanon
  const PrepopulatedEngine* const engines_LB[] = {
@@ -558,7 +548,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -483,7 +483,7 @@ const PrepopulatedEngine* const engines_LB[] = {
+@@ -482,7 +482,7 @@ const PrepopulatedEngine* const engines_LB[] = {
  
  // Liechtenstein
  const PrepopulatedEngine* const engines_LI[] = {
@@ -567,7 +557,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -491,7 +491,7 @@ const PrepopulatedEngine* const engines_LI[] = {
+@@ -490,7 +490,7 @@ const PrepopulatedEngine* const engines_LI[] = {
  
  // Lithuania
  const PrepopulatedEngine* const engines_LT[] = {
@@ -576,7 +566,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_ru,
-@@ -499,7 +499,7 @@ const PrepopulatedEngine* const engines_LT[] = {
+@@ -498,7 +498,7 @@ const PrepopulatedEngine* const engines_LT[] = {
  
  // Luxembourg
  const PrepopulatedEngine* const engines_LU[] = {
@@ -585,7 +575,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -507,7 +507,7 @@ const PrepopulatedEngine* const engines_LU[] = {
+@@ -506,7 +506,7 @@ const PrepopulatedEngine* const engines_LU[] = {
  
  // Latvia
  const PrepopulatedEngine* const engines_LV[] = {
@@ -594,7 +584,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yandex_ru,
      &yahoo,
-@@ -515,7 +515,7 @@ const PrepopulatedEngine* const engines_LV[] = {
+@@ -514,7 +514,7 @@ const PrepopulatedEngine* const engines_LV[] = {
  
  // Libya
  const PrepopulatedEngine* const engines_LY[] = {
@@ -603,7 +593,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_com,
-@@ -523,7 +523,7 @@ const PrepopulatedEngine* const engines_LY[] = {
+@@ -522,7 +522,7 @@ const PrepopulatedEngine* const engines_LY[] = {
  
  // Morocco
  const PrepopulatedEngine* const engines_MA[] = {
@@ -612,7 +602,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_ru,
-@@ -531,7 +531,7 @@ const PrepopulatedEngine* const engines_MA[] = {
+@@ -530,7 +530,7 @@ const PrepopulatedEngine* const engines_MA[] = {
  
  // Monaco
  const PrepopulatedEngine* const engines_MC[] = {
@@ -621,7 +611,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -539,7 +539,7 @@ const PrepopulatedEngine* const engines_MC[] = {
+@@ -538,7 +538,7 @@ const PrepopulatedEngine* const engines_MC[] = {
  
  // Moldova
  const PrepopulatedEngine* const engines_MD[] = {
@@ -630,7 +620,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
      &mail_ru,
      &duckduckgo,
-@@ -547,7 +547,7 @@ const PrepopulatedEngine* const engines_MD[] = {
+@@ -546,7 +546,7 @@ const PrepopulatedEngine* const engines_MD[] = {
  
  // Montenegro
  const PrepopulatedEngine* const engines_ME[] = {
@@ -639,7 +629,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_ru,
-@@ -555,7 +555,7 @@ const PrepopulatedEngine* const engines_ME[] = {
+@@ -554,7 +554,7 @@ const PrepopulatedEngine* const engines_ME[] = {
  
  // Macedonia
  const PrepopulatedEngine* const engines_MK[] = {
@@ -648,7 +638,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &duckduckgo,
-@@ -563,7 +563,7 @@ const PrepopulatedEngine* const engines_MK[] = {
+@@ -562,7 +562,7 @@ const PrepopulatedEngine* const engines_MK[] = {
  
  // Mexico
  const PrepopulatedEngine* const engines_MX[] = {
@@ -657,7 +647,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_mx,
      &duckduckgo,
-@@ -571,7 +571,7 @@ const PrepopulatedEngine* const engines_MX[] = {
+@@ -570,7 +570,7 @@ const PrepopulatedEngine* const engines_MX[] = {
  
  // Malaysia
  const PrepopulatedEngine* const engines_MY[] = {
@@ -666,7 +656,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_my,
      &bing,
      &baidu,
-@@ -579,7 +579,7 @@ const PrepopulatedEngine* const engines_MY[] = {
+@@ -578,7 +578,7 @@ const PrepopulatedEngine* const engines_MY[] = {
  
  // Nicaragua
  const PrepopulatedEngine* const engines_NI[] = {
@@ -675,7 +665,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -587,7 +587,7 @@ const PrepopulatedEngine* const engines_NI[] = {
+@@ -586,7 +586,7 @@ const PrepopulatedEngine* const engines_NI[] = {
  
  // Netherlands
  const PrepopulatedEngine* const engines_NL[] = {
@@ -684,7 +674,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_nl,
      &duckduckgo,
-@@ -595,7 +595,7 @@ const PrepopulatedEngine* const engines_NL[] = {
+@@ -594,7 +594,7 @@ const PrepopulatedEngine* const engines_NL[] = {
  
  // Norway
  const PrepopulatedEngine* const engines_NO[] = {
@@ -693,7 +683,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -603,7 +603,7 @@ const PrepopulatedEngine* const engines_NO[] = {
+@@ -602,7 +602,7 @@ const PrepopulatedEngine* const engines_NO[] = {
  
  // New Zealand
  const PrepopulatedEngine* const engines_NZ[] = {
@@ -702,7 +692,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo_nz,
-@@ -611,7 +611,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
+@@ -610,7 +610,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
  
  // Oman
  const PrepopulatedEngine* const engines_OM[] = {
@@ -711,7 +701,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ask,
-@@ -619,7 +619,7 @@ const PrepopulatedEngine* const engines_OM[] = {
+@@ -618,7 +618,7 @@ const PrepopulatedEngine* const engines_OM[] = {
  
  // Panama
  const PrepopulatedEngine* const engines_PA[] = {
@@ -720,7 +710,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -627,7 +627,7 @@ const PrepopulatedEngine* const engines_PA[] = {
+@@ -626,7 +626,7 @@ const PrepopulatedEngine* const engines_PA[] = {
  
  // Peru
  const PrepopulatedEngine* const engines_PE[] = {
@@ -729,7 +719,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_pe,
      &bing,
      &duckduckgo,
-@@ -635,7 +635,7 @@ const PrepopulatedEngine* const engines_PE[] = {
+@@ -634,7 +634,7 @@ const PrepopulatedEngine* const engines_PE[] = {
  
  // Philippines
  const PrepopulatedEngine* const engines_PH[] = {
@@ -738,7 +728,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_ph,
      &bing,
      &duckduckgo,
-@@ -643,7 +643,7 @@ const PrepopulatedEngine* const engines_PH[] = {
+@@ -642,7 +642,7 @@ const PrepopulatedEngine* const engines_PH[] = {
  
  // Pakistan
  const PrepopulatedEngine* const engines_PK[] = {
@@ -747,7 +737,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &baidu,
-@@ -651,7 +651,7 @@ const PrepopulatedEngine* const engines_PK[] = {
+@@ -650,7 +650,7 @@ const PrepopulatedEngine* const engines_PK[] = {
  
  // Poland
  const PrepopulatedEngine* const engines_PL[] = {
@@ -756,7 +746,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -659,7 +659,7 @@ const PrepopulatedEngine* const engines_PL[] = {
+@@ -658,7 +658,7 @@ const PrepopulatedEngine* const engines_PL[] = {
  
  // Puerto Rico
  const PrepopulatedEngine* const engines_PR[] = {
@@ -765,7 +755,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -667,7 +667,7 @@ const PrepopulatedEngine* const engines_PR[] = {
+@@ -666,7 +666,7 @@ const PrepopulatedEngine* const engines_PR[] = {
  
  // Portugal
  const PrepopulatedEngine* const engines_PT[] = {
@@ -774,7 +764,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -675,7 +675,7 @@ const PrepopulatedEngine* const engines_PT[] = {
+@@ -674,7 +674,7 @@ const PrepopulatedEngine* const engines_PT[] = {
  
  // Paraguay
  const PrepopulatedEngine* const engines_PY[] = {
@@ -783,7 +773,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -683,7 +683,7 @@ const PrepopulatedEngine* const engines_PY[] = {
+@@ -682,7 +682,7 @@ const PrepopulatedEngine* const engines_PY[] = {
  
  // Qatar
  const PrepopulatedEngine* const engines_QA[] = {
@@ -792,7 +782,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ask,
-@@ -691,7 +691,7 @@ const PrepopulatedEngine* const engines_QA[] = {
+@@ -690,7 +690,7 @@ const PrepopulatedEngine* const engines_QA[] = {
  
  // Romania
  const PrepopulatedEngine* const engines_RO[] = {
@@ -801,7 +791,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -699,7 +699,7 @@ const PrepopulatedEngine* const engines_RO[] = {
+@@ -698,7 +698,7 @@ const PrepopulatedEngine* const engines_RO[] = {
  
  // Serbia
  const PrepopulatedEngine* const engines_RS[] = {
@@ -810,7 +800,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &duckduckgo,
-@@ -708,14 +708,14 @@ const PrepopulatedEngine* const engines_RS[] = {
+@@ -707,14 +707,14 @@ const PrepopulatedEngine* const engines_RS[] = {
  // Russia
  const PrepopulatedEngine* const engines_RU[] = {
      &yandex_ru,
@@ -827,7 +817,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_ru,
-@@ -723,7 +723,7 @@ const PrepopulatedEngine* const engines_RW[] = {
+@@ -722,7 +722,7 @@ const PrepopulatedEngine* const engines_RW[] = {
  
  // Saudi Arabia
  const PrepopulatedEngine* const engines_SA[] = {
@@ -836,7 +826,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_com,
-@@ -731,7 +731,7 @@ const PrepopulatedEngine* const engines_SA[] = {
+@@ -730,7 +730,7 @@ const PrepopulatedEngine* const engines_SA[] = {
  
  // Sweden
  const PrepopulatedEngine* const engines_SE[] = {
@@ -845,7 +835,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_se,
      &duckduckgo,
-@@ -739,7 +739,7 @@ const PrepopulatedEngine* const engines_SE[] = {
+@@ -738,7 +738,7 @@ const PrepopulatedEngine* const engines_SE[] = {
  
  // Singapore
  const PrepopulatedEngine* const engines_SG[] = {
@@ -854,7 +844,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_sg,
      &yandex_com,
-@@ -747,7 +747,7 @@ const PrepopulatedEngine* const engines_SG[] = {
+@@ -746,7 +746,7 @@ const PrepopulatedEngine* const engines_SG[] = {
  
  // Slovenia
  const PrepopulatedEngine* const engines_SI[] = {
@@ -863,7 +853,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -755,7 +755,7 @@ const PrepopulatedEngine* const engines_SI[] = {
+@@ -754,7 +754,7 @@ const PrepopulatedEngine* const engines_SI[] = {
  
  // Slovakia
  const PrepopulatedEngine* const engines_SK[] = {
@@ -872,7 +862,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -763,7 +763,7 @@ const PrepopulatedEngine* const engines_SK[] = {
+@@ -762,7 +762,7 @@ const PrepopulatedEngine* const engines_SK[] = {
  
  // El Salvador
  const PrepopulatedEngine* const engines_SV[] = {
@@ -881,7 +871,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -771,7 +771,7 @@ const PrepopulatedEngine* const engines_SV[] = {
+@@ -770,7 +770,7 @@ const PrepopulatedEngine* const engines_SV[] = {
  
  // Syria
  const PrepopulatedEngine* const engines_SY[] = {
@@ -890,7 +880,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_ru,
-@@ -779,7 +779,7 @@ const PrepopulatedEngine* const engines_SY[] = {
+@@ -778,7 +778,7 @@ const PrepopulatedEngine* const engines_SY[] = {
  
  // Thailand
  const PrepopulatedEngine* const engines_TH[] = {
@@ -899,7 +889,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_th,
      &bing,
      &ask,
-@@ -787,7 +787,7 @@ const PrepopulatedEngine* const engines_TH[] = {
+@@ -786,7 +786,7 @@ const PrepopulatedEngine* const engines_TH[] = {
  
  // Tunisia
  const PrepopulatedEngine* const engines_TN[] = {
@@ -908,7 +898,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &bing,
      &yandex_ru,
-@@ -795,7 +795,7 @@ const PrepopulatedEngine* const engines_TN[] = {
+@@ -794,7 +794,7 @@ const PrepopulatedEngine* const engines_TN[] = {
  
  // Turkey
  const PrepopulatedEngine* const engines_TR[] = {
@@ -917,7 +907,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_tr,
      &yahoo_tr,
      &bing,
-@@ -803,7 +803,7 @@ const PrepopulatedEngine* const engines_TR[] = {
+@@ -802,7 +802,7 @@ const PrepopulatedEngine* const engines_TR[] = {
  
  // Trinidad and Tobago
  const PrepopulatedEngine* const engines_TT[] = {
@@ -926,7 +916,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -811,7 +811,7 @@ const PrepopulatedEngine* const engines_TT[] = {
+@@ -810,7 +810,7 @@ const PrepopulatedEngine* const engines_TT[] = {
  
  // Taiwan
  const PrepopulatedEngine* const engines_TW[] = {
@@ -935,7 +925,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_tw,
      &bing,
      &baidu,
-@@ -819,7 +819,7 @@ const PrepopulatedEngine* const engines_TW[] = {
+@@ -818,7 +818,7 @@ const PrepopulatedEngine* const engines_TW[] = {
  
  // Tanzania
  const PrepopulatedEngine* const engines_TZ[] = {
@@ -944,7 +934,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_ru,
-@@ -827,7 +827,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
+@@ -826,7 +826,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
  
  // Ukraine
  const PrepopulatedEngine* const engines_UA[] = {
@@ -953,7 +943,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ua,
      &mail_ru,
      &bing,
-@@ -835,7 +835,7 @@ const PrepopulatedEngine* const engines_UA[] = {
+@@ -834,7 +834,7 @@ const PrepopulatedEngine* const engines_UA[] = {
  
  // United States
  const PrepopulatedEngine* const engines_US[] = {
@@ -962,7 +952,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -843,7 +843,7 @@ const PrepopulatedEngine* const engines_US[] = {
+@@ -842,7 +842,7 @@ const PrepopulatedEngine* const engines_US[] = {
  
  // Uruguay
  const PrepopulatedEngine* const engines_UY[] = {
@@ -971,7 +961,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -851,7 +851,7 @@ const PrepopulatedEngine* const engines_UY[] = {
+@@ -850,7 +850,7 @@ const PrepopulatedEngine* const engines_UY[] = {
  
  // Venezuela
  const PrepopulatedEngine* const engines_VE[] = {
@@ -980,7 +970,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_ve,
      &bing,
      &duckduckgo,
-@@ -859,7 +859,7 @@ const PrepopulatedEngine* const engines_VE[] = {
+@@ -858,7 +858,7 @@ const PrepopulatedEngine* const engines_VE[] = {
  
  // Vietnam
  const PrepopulatedEngine* const engines_VN[] = {
@@ -989,7 +979,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &coccoc,
      &bing,
      &yahoo_vn,
-@@ -867,7 +867,7 @@ const PrepopulatedEngine* const engines_VN[] = {
+@@ -866,7 +866,7 @@ const PrepopulatedEngine* const engines_VN[] = {
  
  // Yemen
  const PrepopulatedEngine* const engines_YE[] = {
@@ -998,7 +988,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &baidu,
-@@ -875,7 +875,7 @@ const PrepopulatedEngine* const engines_YE[] = {
+@@ -874,7 +874,7 @@ const PrepopulatedEngine* const engines_YE[] = {
  
  // South Africa
  const PrepopulatedEngine* const engines_ZA[] = {
@@ -1007,7 +997,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -883,7 +883,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
+@@ -882,7 +882,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
  
  // Zimbabwe
  const PrepopulatedEngine* const engines_ZW[] = {
@@ -1016,7 +1006,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &baidu,
-@@ -899,7 +899,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
+@@ -898,7 +898,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
      &coccoc,
      &daum,
      &duckduckgo,
@@ -1024,7 +1014,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
 +    &google, &startpage,
      &mail_ru,
      &naver,
-     &parsijoo,
+     &qwant,
 -- 
 2.11.0
 

build/patches/Add-an-always-incognito-mode.patch

@@ -7,13 +7,13 @@ clicked links to launch as incognito.
 ---
  .../android/java/res/xml/privacy_preferences.xml   |  5 ++
  .../browser/AlwaysIncognitoLinkInterceptor.java    | 73 ++++++++++++++++++++++
- .../chromium/chrome/browser/ChromeActivity.java    |  4 ++
+ .../chromium/chrome/browser/ChromeActivity.java    |  5 ++
  .../chrome/browser/appmenu/AppMenuHandler.java     | 12 ++++
  .../contextmenu/ChromeContextMenuPopulator.java    |  9 ++-
  .../chrome/browser/tabmodel/ChromeTabCreator.java  | 24 ++++++-
  .../java/strings/android_chrome_strings.grd        |  6 ++
  chrome/android/java_sources.gni                    |  1 +
- 8 files changed, 132 insertions(+), 2 deletions(-)
+ 8 files changed, 133 insertions(+), 2 deletions(-)
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
 
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -112,15 +112,16 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -260,6 +260,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
-     private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
+@@ -217,6 +217,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  
-     // Observes when sync becomes ready to create the mContextReporter.
-+    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
-     private ProfileSyncService.SyncStateChangedListener mSyncStateChangedListener;
+     private static final int RECORD_MULTI_WINDOW_SCREEN_WIDTH_DELAY_MS = 5000;
  
-     @Nullable
-@@ -1731,6 +1732,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
++    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
++
+     /**
+      * Timeout in ms for reading PartnerBrowserCustomizations provider.
+      */
+@@ -1697,6 +1699,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              throw new IllegalStateException(
                      "Attempting to access TabCreator before initialization");
          }

build/patches/Add-exit-menu-item.patch

@@ -25,7 +25,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2150,6 +2150,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2116,6 +2116,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              RecordUserAction.record("MobileMenuSettings");
          } else if (id == R.id.show_menu) {
              showAppMenuForKeyboardEvent();

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

@@ -75,7 +75,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2253,6 +2253,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2219,6 +2219,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              currentTab.getWebContents().getNavigationController().setUseDesktopUserAgent(
                      !usingDesktopUserAgent, reloadOnChange);
              RecordUserAction.record("MobileMenuRequestDesktopSite");

build/patches/Bromite-adblock-engine.patch

@@ -177,7 +177,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2263,6 +2263,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2229,6 +2229,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              RecordUserAction.record("MobileMenuRequestEnableJavascript");
          } else if (id == R.id.reader_mode_prefs_id) {
              DomDistillerUIUtils.openSettings(currentTab.getWebContents());

build/patches/Disable-sync-adaptive-service-from-manifest.patch

@@ -1,134 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 14 Apr 2019 12:08:27 +0200
-Subject: Disable sync adaptive service from manifest
-
-Prevents authorization prompt for Play services on reboot
-
-Remove sync invalidation service
-
-Fixes building with debug symbols:
-
-ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
->>> referenced by invalidation_service_util.cc:17 (../../components/invalidation/impl/invalidation_service_util.cc:17)
->>>               impl/invalidation_service_util.o:(invalidation::ParseNotifierOptions(base::CommandLine const&)) in archive obj/components/invalidation/impl/libimpl.a
----
- chrome/android/BUILD.gn                             |  4 +---
- chrome/android/java/AndroidManifest.xml             | 19 -------------------
- .../invalidation/impl/invalidation_service_util.cc  | 21 ---------------------
- .../invalidation/impl/invalidation_service_util.h   |  6 +-----
- 4 files changed, 2 insertions(+), 48 deletions(-)
-
-diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
---- a/chrome/android/BUILD.gn
-+++ b/chrome/android/BUILD.gn
-@@ -1023,8 +1023,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
-   resources = [
-     "java/res_template/xml/file_paths.xml",
-     "java/res_template/xml/launchershortcuts.xml",
--    "java/res_template/xml/searchable.xml",
--    "java/res_template/xml/syncadapter.xml",
-+    "java/res_template/xml/searchable.xml"
-   ]
-   res_dir = "java/res_template"
-   variables = [ "manifest_package=$manifest_package" ]
-@@ -1035,7 +1034,6 @@ jinja_template_resources("chrome_test_apk_template_resources") {
-     "java/res_template/xml/file_paths.xml",
-     "java/res_template/xml/launchershortcuts.xml",
-     "java/res_template/xml/searchable.xml",
--    "java/res_template/xml/syncadapter.xml",
-   ]
-   res_dir = "java/res_template"
- 
-diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
---- a/chrome/android/java/AndroidManifest.xml
-+++ b/chrome/android/java/AndroidManifest.xml
-@@ -925,16 +925,6 @@ by a child template that "extends" this file.
-                 android:resource="@xml/file_paths" />
-         </provider>
- 
--        <!-- Sync adapter for browser invalidation. -->
--        <service android:name="org.chromium.chrome.browser.invalidation.ChromeBrowserSyncAdapterService"
--            android:exported="false">
--            <intent-filter>
--                <action android:name="android.content.SyncAdapter" />
--            </intent-filter>
--            <meta-data android:name="android.content.SyncAdapter"
--                       android:resource="@xml/syncadapter" />
--        </service>
--
-         <!-- Broadcast receiver that will be notified of account changes -->
-         <receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver">
-             <intent-filter>
-@@ -1040,15 +1030,6 @@ by a child template that "extends" this file.
-         <service android:name="org.chromium.chrome.browser.services.gcm.InvalidationGcmUpstreamSender"
-             android:exported="false"/>
- 
--        <!-- Notification service for sync. -->
--        <meta-data android:name="ipc.invalidation.ticl.listener_service_class"
--            android:value="org.chromium.chrome.browser.invalidation.ChromeInvalidationClientService"/>
--        <service android:name="org.chromium.chrome.browser.invalidation.ChromeInvalidationClientService"
--            android:exported="false">
--            <intent-filter>
--              <action android:name="com.google.ipc.invalidation.AUTH_TOKEN_REQUEST"/>
--            </intent-filter>
--        </service>
-         <service android:name="com.google.ipc.invalidation.ticl.android2.TiclService"
-             android:exported="false"/>
-         <service android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageSenderService"
-diff --git a/components/invalidation/impl/invalidation_service_util.cc b/components/invalidation/impl/invalidation_service_util.cc
---- a/components/invalidation/impl/invalidation_service_util.cc
-+++ b/components/invalidation/impl/invalidation_service_util.cc
-@@ -12,27 +12,6 @@
- 
- namespace invalidation {
- 
--notifier::NotifierOptions ParseNotifierOptions(
--    const base::CommandLine& command_line) {
--  notifier::NotifierOptions notifier_options;
--
--  if (command_line.HasSwitch(switches::kSyncNotificationHostPort)) {
--    notifier_options.xmpp_host_port =
--        net::HostPortPair::FromString(
--            command_line.GetSwitchValueASCII(
--                switches::kSyncNotificationHostPort));
--    DVLOG(1) << "Using " << notifier_options.xmpp_host_port.ToString()
--             << " for test sync notification server.";
--  }
--
--  notifier_options.allow_insecure_connection =
--      command_line.HasSwitch(switches::kSyncAllowInsecureXmppConnection);
--  DVLOG_IF(1, notifier_options.allow_insecure_connection)
--      << "Allowing insecure XMPP connections.";
--
--  return notifier_options;
--}
--
- std::string GenerateInvalidatorClientId() {
-   // Generate a GUID with 128 bits worth of base64-encoded randomness.
-   // This format is similar to that of sync's cache_guid.
-diff --git a/components/invalidation/impl/invalidation_service_util.h b/components/invalidation/impl/invalidation_service_util.h
---- a/components/invalidation/impl/invalidation_service_util.h
-+++ b/components/invalidation/impl/invalidation_service_util.h
-@@ -5,7 +5,7 @@
- #ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_UTIL_H_
- #define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_UTIL_H_
- 
--#include "jingle/notifier/base/notifier_options.h"
-+#include <string>
- 
- namespace base {
- class CommandLine;
-@@ -13,10 +13,6 @@ class CommandLine;
- 
- namespace invalidation {
- 
--// Parses the given command line for notifier options.
--notifier::NotifierOptions ParseNotifierOptions(
--    const base::CommandLine& command_line);
--
- // Generates a unique client ID for the invalidator.
- std::string GenerateInvalidatorClientId();
- 
--- 
-2.11.0
-

build/patches/Disable-unused-permissions.patch

@@ -0,0 +1,510 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 14 Apr 2019 12:08:27 +0200
+Subject: Disable unused permissions
+
+Disable sync adaptive and invalidation services from manifest
+
+Prevents authorization prompt for Play services on reboot
+
+Fixes building with debug symbols:
+
+ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
+>>> referenced by invalidation_service_util.cc:17 (../../components/invalidation/impl/invalidation_service_util.cc:17)
+>>>               impl/invalidation_service_util.o:(invalidation::ParseNotifierOptions(base::CommandLine const&)) in archive obj/components/invalidation/impl/libimpl.a
+
+Fixup more permission removal
+---
+ chrome/android/BUILD.gn                            |   4 +-
+ chrome/android/java/AndroidManifest.xml            |  27 -----
+ .../chromium/chrome/browser/ChromeActivity.java    |  34 ------
+ .../invalidation/impl/invalidation_service_util.cc |  21 ----
+ .../invalidation/impl/invalidation_service_util.h  |   6 +-
+ .../signin/SystemAccountManagerDelegate.java       |  38 +------
+ .../components/sync/AndroidSyncSettings.java       |  24 +---
+ .../chromium/net/HttpNegotiateAuthenticator.java   | 122 +--------------------
+ .../chromoting/base/OAuthTokenFetcher.java         |   2 -
+ 9 files changed, 13 insertions(+), 265 deletions(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
++++ b/chrome/android/BUILD.gn
+@@ -1023,8 +1023,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
+   resources = [
+     "java/res_template/xml/file_paths.xml",
+     "java/res_template/xml/launchershortcuts.xml",
+-    "java/res_template/xml/searchable.xml",
+-    "java/res_template/xml/syncadapter.xml",
++    "java/res_template/xml/searchable.xml"
+   ]
+   res_dir = "java/res_template"
+   variables = [ "manifest_package=$manifest_package" ]
+@@ -1035,7 +1034,6 @@ jinja_template_resources("chrome_test_apk_template_resources") {
+     "java/res_template/xml/file_paths.xml",
+     "java/res_template/xml/launchershortcuts.xml",
+     "java/res_template/xml/searchable.xml",
+-    "java/res_template/xml/syncadapter.xml",
+   ]
+   res_dir = "java/res_template"
+ 
+diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
+--- a/chrome/android/java/AndroidManifest.xml
++++ b/chrome/android/java/AndroidManifest.xml
+@@ -44,25 +44,19 @@ by a child template that "extends" this file.
+     {% if target_sdk_version|int > 27 or target_sdk_version == "Q" %}
+         <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+     {% endif %}
+-    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+     <uses-permission android:name="android.permission.INTERNET"/>
+-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
+     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+     {% if target_sdk_version|int > 28 or target_sdk_version == "Q" %}
+         <uses-permission-sdk-23 android:name="android.permission.READ_MEDIA_IMAGES"/>
+     {% endif %}
+     <uses-permission android:name="android.permission.NFC"/>
+     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
+-    <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
+     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+-    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
+     <uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
+     <uses-permission android:name="android.permission.VIBRATE"/>
+     <uses-permission android:name="android.permission.WAKE_LOCK"/>
+     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
+     {% set enable_vr = enable_vr|default(0) %}
+     {% if enable_vr == "true" %}
+     <!-- Indicates use of Android's VR-mode, available only on Android N+. -->
+@@ -100,8 +94,6 @@ by a child template that "extends" this file.
+     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
+ 
+-    <uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
+-
+     {% block extra_uses_permissions %}
+     {% endblock %}
+ 
+@@ -925,16 +917,6 @@ by a child template that "extends" this file.
+                 android:resource="@xml/file_paths" />
+         </provider>
+ 
+-        <!-- Sync adapter for browser invalidation. -->
+-        <service android:name="org.chromium.chrome.browser.invalidation.ChromeBrowserSyncAdapterService"
+-            android:exported="false">
+-            <intent-filter>
+-                <action android:name="android.content.SyncAdapter" />
+-            </intent-filter>
+-            <meta-data android:name="android.content.SyncAdapter"
+-                       android:resource="@xml/syncadapter" />
+-        </service>
+-
+         <!-- Broadcast receiver that will be notified of account changes -->
+         <receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver">
+             <intent-filter>
+@@ -1040,15 +1022,6 @@ by a child template that "extends" this file.
+         <service android:name="org.chromium.chrome.browser.services.gcm.InvalidationGcmUpstreamSender"
+             android:exported="false"/>
+ 
+-        <!-- Notification service for sync. -->
+-        <meta-data android:name="ipc.invalidation.ticl.listener_service_class"
+-            android:value="org.chromium.chrome.browser.invalidation.ChromeInvalidationClientService"/>
+-        <service android:name="org.chromium.chrome.browser.invalidation.ChromeInvalidationClientService"
+-            android:exported="false">
+-            <intent-filter>
+-              <action android:name="com.google.ipc.invalidation.AUTH_TOKEN_REQUEST"/>
+-            </intent-filter>
+-        </service>
+         <service android:name="com.google.ipc.invalidation.ticl.android2.TiclService"
+             android:exported="false"/>
+         <service android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageSenderService"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+@@ -127,8 +127,6 @@ import org.chromium.chrome.browser.share.ShareMenuActionHandler;
+ import org.chromium.chrome.browser.snackbar.BottomContainer;
+ import org.chromium.chrome.browser.snackbar.SnackbarManager;
+ import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
+-import org.chromium.chrome.browser.sync.ProfileSyncService;
+-import org.chromium.chrome.browser.sync.SyncController;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tab.TabThemeColorHelper;
+ import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager;
+@@ -259,9 +257,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+     @SuppressLint("NewApi")
+     private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
+ 
+-    // Observes when sync becomes ready to create the mContextReporter.
+-    private ProfileSyncService.SyncStateChangedListener mSyncStateChangedListener;
+-
+     @Nullable
+     private ChromeFullscreenManager mFullscreenManager;
+ 
+@@ -966,28 +961,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+     private void createContextReporterIfNeeded() {
+         if (!mStarted) return; // Sync state reporting should work only in started state.
+         if (mContextReporter != null || getActivityTab() == null) return;
+-
+-        final SyncController syncController = SyncController.get(this);
+-        final ProfileSyncService syncService = ProfileSyncService.get();
+-
+-        if (syncController != null && syncController.isSyncingUrlsWithKeystorePassphrase()) {
+-            assert syncService != null;
+-            mContextReporter = AppHooks.get().createGsaHelper().getContextReporter(this);
+-
+-            if (mSyncStateChangedListener != null) {
+-                syncService.removeSyncStateChangedListener(mSyncStateChangedListener);
+-                mSyncStateChangedListener = null;
+-            }
+-
+-            return;
+-        } else {
+-            ContextReporter.reportSyncStatus(syncService);
+-        }
+-
+-        if (mSyncStateChangedListener == null && syncService != null) {
+-            mSyncStateChangedListener = () -> createContextReporterIfNeeded();
+-            syncService.addSyncStateChangedListener(mSyncStateChangedListener);
+-        }
+     }
+ 
+     @Override
+@@ -1056,13 +1029,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+         if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) {
+             GSAAccountChangeListener.getInstance().disconnect();
+         }
+-        if (mSyncStateChangedListener != null) {
+-            ProfileSyncService syncService = ProfileSyncService.get();
+-            if (syncService != null) {
+-                syncService.removeSyncStateChangedListener(mSyncStateChangedListener);
+-            }
+-            mSyncStateChangedListener = null;
+-        }
+         if (mContextReporter != null) mContextReporter.disable();
+ 
+         super.onStopWithNative();
+diff --git a/components/invalidation/impl/invalidation_service_util.cc b/components/invalidation/impl/invalidation_service_util.cc
+--- a/components/invalidation/impl/invalidation_service_util.cc
++++ b/components/invalidation/impl/invalidation_service_util.cc
+@@ -12,27 +12,6 @@
+ 
+ namespace invalidation {
+ 
+-notifier::NotifierOptions ParseNotifierOptions(
+-    const base::CommandLine& command_line) {
+-  notifier::NotifierOptions notifier_options;
+-
+-  if (command_line.HasSwitch(switches::kSyncNotificationHostPort)) {
+-    notifier_options.xmpp_host_port =
+-        net::HostPortPair::FromString(
+-            command_line.GetSwitchValueASCII(
+-                switches::kSyncNotificationHostPort));
+-    DVLOG(1) << "Using " << notifier_options.xmpp_host_port.ToString()
+-             << " for test sync notification server.";
+-  }
+-
+-  notifier_options.allow_insecure_connection =
+-      command_line.HasSwitch(switches::kSyncAllowInsecureXmppConnection);
+-  DVLOG_IF(1, notifier_options.allow_insecure_connection)
+-      << "Allowing insecure XMPP connections.";
+-
+-  return notifier_options;
+-}
+-
+ std::string GenerateInvalidatorClientId() {
+   // Generate a GUID with 128 bits worth of base64-encoded randomness.
+   // This format is similar to that of sync's cache_guid.
+diff --git a/components/invalidation/impl/invalidation_service_util.h b/components/invalidation/impl/invalidation_service_util.h
+--- a/components/invalidation/impl/invalidation_service_util.h
++++ b/components/invalidation/impl/invalidation_service_util.h
+@@ -5,7 +5,7 @@
+ #ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_UTIL_H_
+ #define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_UTIL_H_
+ 
+-#include "jingle/notifier/base/notifier_options.h"
++#include <string>
+ 
+ namespace base {
+ class CommandLine;
+@@ -13,10 +13,6 @@ class CommandLine;
+ 
+ namespace invalidation {
+ 
+-// Parses the given command line for notifier options.
+-notifier::NotifierOptions ParseNotifierOptions(
+-    const base::CommandLine& command_line);
+-
+ // Generates a unique client ID for the invalidator.
+ std::string GenerateInvalidatorClientId();
+ 
+diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
+--- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
++++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
+@@ -167,16 +167,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
+ 
+     @Override
+     public boolean hasFeatures(Account account, String[] features) {
+-        if (!hasGetAccountsPermission()) {
+-            return false;
+-        }
+-        try {
+-            return mAccountManager.hasFeatures(account, features, null, null).getResult();
+-        } catch (AuthenticatorException | IOException e) {
+-            Log.e(TAG, "Error while checking features: ", e);
+-        } catch (OperationCanceledException e) {
+-            Log.e(TAG, "Checking features was cancelled. This should not happen.");
+-        }
+         return false;
+     }
+ 
+@@ -216,32 +206,10 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
+     public void updateCredentials(
+             Account account, Activity activity, final Callback<Boolean> callback) {
+         ThreadUtils.assertOnUiThread();
+-        if (!hasManageAccountsPermission()) {
+-            if (callback != null) {
+-                ThreadUtils.postOnUiThread(() -> callback.onResult(false));
+-            }
+-            return;
++        if (callback != null) {
++            ThreadUtils.postOnUiThread(() -> callback.onResult(false));
+         }
+-
+-        AccountManagerCallback<Bundle> realCallback = future -> {
+-            Bundle bundle = null;
+-            try {
+-                bundle = future.getResult();
+-            } catch (AuthenticatorException | IOException e) {
+-                Log.e(TAG, "Error while update credentials: ", e);
+-            } catch (OperationCanceledException e) {
+-                Log.w(TAG, "Updating credentials was cancelled.");
+-            }
+-            boolean success =
+-                    bundle != null && bundle.getString(AccountManager.KEY_ACCOUNT_TYPE) != null;
+-            if (callback != null) {
+-                callback.onResult(success);
+-            }
+-        };
+-        // Android 4.4 throws NullPointerException if null is passed
+-        Bundle emptyOptions = new Bundle();
+-        mAccountManager.updateCredentials(
+-                account, "android", emptyOptions, activity, realCallback, null);
++        return;
+     }
+ 
+     protected boolean hasGetAccountsPermission() {
+diff --git a/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java b/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
+--- a/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
++++ b/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
+@@ -212,13 +212,7 @@ public class AndroidSyncSettings {
+ 
+     private void setChromeSyncEnabled(boolean value) {
+         synchronized (mLock) {
+-            updateSyncability(null);
+-            if (value == mChromeSyncEnabled || mAccount == null) return;
+-            mChromeSyncEnabled = value;
+-
+-            StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
+-            mSyncContentResolverDelegate.setSyncAutomatically(mAccount, mContractAuthority, value);
+-            StrictMode.setThreadPolicy(oldPolicy);
++            mChromeSyncEnabled = false;
+         }
+         notifyObservers();
+     }
+@@ -299,19 +293,9 @@ public class AndroidSyncSettings {
+             boolean oldChromeSyncEnabled = mChromeSyncEnabled;
+             boolean oldMasterSyncEnabled = mMasterSyncEnabled;
+ 
+-            StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
+-            if (mAccount != null) {
+-                mIsSyncable =
+-                        mSyncContentResolverDelegate.getIsSyncable(mAccount, mContractAuthority)
+-                        == 1;
+-                mChromeSyncEnabled = mSyncContentResolverDelegate.getSyncAutomatically(
+-                        mAccount, mContractAuthority);
+-            } else {
+-                mIsSyncable = false;
+-                mChromeSyncEnabled = false;
+-            }
+-            mMasterSyncEnabled = mSyncContentResolverDelegate.getMasterSyncAutomatically();
+-            StrictMode.setThreadPolicy(oldPolicy);
++            mIsSyncable = false;
++            mChromeSyncEnabled = false;
++            mMasterSyncEnabled = false;
+ 
+             return oldChromeSyncEnabled != mChromeSyncEnabled
+                     || oldMasterSyncEnabled != mMasterSyncEnabled;
+diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
+--- a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
++++ b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
+@@ -96,50 +96,7 @@ public class HttpNegotiateAuthenticator {
+ 
+         @Override
+         public void run(AccountManagerFuture<Account[]> future) {
+-            Account[] accounts;
+-            try {
+-                accounts = future.getResult();
+-            } catch (OperationCanceledException | AuthenticatorException | IOException e) {
+-                Log.w(TAG, "ERR_UNEXPECTED: Error while attempting to retrieve accounts.", e);
+-                nativeSetResult(mRequestData.nativeResultObject, NetError.ERR_UNEXPECTED, null);
+-                return;
+-            }
+-
+-            if (accounts.length == 0) {
+-                Log.w(TAG, "ERR_MISSING_AUTH_CREDENTIALS: No account provided for the kerberos "
+-                                + "authentication. Please verify the configuration policies and "
+-                                + "that the CONTACTS runtime permission is granted. ");
+-                nativeSetResult(mRequestData.nativeResultObject,
+-                        NetError.ERR_MISSING_AUTH_CREDENTIALS, null);
+-                return;
+-            }
+-
+-            if (accounts.length > 1) {
+-                Log.w(TAG, "ERR_MISSING_AUTH_CREDENTIALS: Found %d accounts eligible for the "
+-                                + "kerberos authentication. Please fix the configuration by "
+-                                + "providing a single account.",
+-                        accounts.length);
+-                nativeSetResult(mRequestData.nativeResultObject,
+-                        NetError.ERR_MISSING_AUTH_CREDENTIALS, null);
+-                return;
+-            }
+-
+-            if (lacksPermission(ContextUtils.getApplicationContext(),
+-                        "android.permission.USE_CREDENTIALS", true)) {
+-                // Protecting the AccountManager#getAuthToken call.
+-                // API  < 23 Requires the USE_CREDENTIALS permission or throws an exception.
+-                // API >= 23 USE_CREDENTIALS permission is removed
+-                Log.e(TAG, "ERR_MISCONFIGURED_AUTH_ENVIRONMENT: USE_CREDENTIALS permission not "
+-                                + "granted. Aborting authentication.");
+-                nativeSetResult(mRequestData.nativeResultObject,
+-                        NetError.ERR_MISCONFIGURED_AUTH_ENVIRONMENT, null);
+-                return;
+-            }
+-            mRequestData.account = accounts[0];
+-            mRequestData.accountManager.getAuthToken(mRequestData.account,
+-                    mRequestData.authTokenType, mRequestData.options, true /* notifyAuthFailure */,
+-                    new GetTokenCallback(mRequestData),
+-                    new Handler(ThreadUtils.getUiThreadLooper()));
++            // account-based authentication removed for privacy-violations concerns
+         }
+     }
+ 
+@@ -152,41 +109,7 @@ public class HttpNegotiateAuthenticator {
+ 
+         @Override
+         public void run(AccountManagerFuture<Bundle> future) {
+-            Bundle result;
+-            try {
+-                result = future.getResult();
+-            } catch (OperationCanceledException | AuthenticatorException | IOException e) {
+-                Log.w(TAG, "ERR_UNEXPECTED: Error while attempting to obtain a token.", e);
+-                nativeSetResult(mRequestData.nativeResultObject, NetError.ERR_UNEXPECTED, null);
+-                return;
+-            }
+-
+-            if (result.containsKey(AccountManager.KEY_INTENT)) {
+-                final Context appContext = ContextUtils.getApplicationContext();
+-
+-                // We wait for a broadcast that should be sent once the user is done interacting
+-                // with the notification
+-                // TODO(dgn) We currently hang around if the notification is swiped away, until
+-                // a LOGIN_ACCOUNTS_CHANGED_ACTION filter is received. It might be for something
+-                // unrelated then we would wait again here. Maybe we should limit the number of
+-                // retries in some way?
+-                BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
+-
+-                    @Override
+-                    public void onReceive(Context context, Intent intent) {
+-                        appContext.unregisterReceiver(this);
+-                        mRequestData.accountManager.getAuthToken(mRequestData.account,
+-                                mRequestData.authTokenType, mRequestData.options,
+-                                true /* notifyAuthFailure */, new GetTokenCallback(mRequestData),
+-                                null);
+-                    }
+-
+-                };
+-                appContext.registerReceiver(broadcastReceiver,
+-                        new IntentFilter(AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION));
+-            } else {
+-                processResult(result, mRequestData);
+-            }
++            // ditto
+         }
+     }
+ 
+@@ -299,22 +222,7 @@ public class HttpNegotiateAuthenticator {
+      */
+     private void requestTokenWithoutActivity(
+             Context ctx, RequestData requestData, String[] features) {
+-        if (lacksPermission(ctx, Manifest.permission.GET_ACCOUNTS, true /* onlyPreM */)) {
+-            // Protecting the AccountManager#getAccountsByTypeAndFeatures call.
+-            // API  < 23 Requires the GET_ACCOUNTS permission or throws an exception.
+-            // API >= 23 Requires the GET_ACCOUNTS permission (CONTACTS permission group) or
+-            //           returns only the accounts whose authenticator has a signature that
+-            //           matches our app. Working with this restriction and not requesting
+-            //           the permission is a valid use case in the context of WebView, so we
+-            //           don't require it on M+
+-            Log.e(TAG, "ERR_MISCONFIGURED_AUTH_ENVIRONMENT: GET_ACCOUNTS permission not "
+-                            + "granted. Aborting authentication.");
+-            nativeSetResult(requestData.nativeResultObject,
+-                    NetError.ERR_MISCONFIGURED_AUTH_ENVIRONMENT, null);
+-            return;
+-        }
+-        requestData.accountManager.getAccountsByTypeAndFeatures(mAccountType, features,
+-                new GetAccountsCallback(requestData), new Handler(ThreadUtils.getUiThreadLooper()));
++        // ditto
+     }
+ 
+     /**
+@@ -333,29 +241,7 @@ public class HttpNegotiateAuthenticator {
+      */
+     private void requestTokenWithActivity(
+             Context ctx, Activity activity, RequestData requestData, String[] features) {
+-        boolean isPreM = Build.VERSION.SDK_INT < Build.VERSION_CODES.M;
+-        String permission = isPreM
+-                ? "android.permission.MANAGE_ACCOUNTS"
+-                : Manifest.permission.GET_ACCOUNTS;
+-
+-        // Check if the AccountManager#getAuthTokenByFeatures call can be made.
+-        // API  < 23 Requires the MANAGE_ACCOUNTS permission.
+-        // API >= 23 Requires the GET_ACCOUNTS permission to behave properly. When it's not granted,
+-        //           accounts not managed by the current application can't be retrieved. Depending
+-        //           on the authenticator implementation, it might prompt to create an account, but
+-        //           that won't be saved. This would be a bad user experience, so we also consider
+-        //           it a failure case.
+-        if (lacksPermission(ctx, permission, isPreM)) {
+-            Log.e(TAG, "ERR_MISCONFIGURED_AUTH_ENVIRONMENT: %s permission not granted. "
+-                       + "Aborting authentication", permission);
+-            nativeSetResult(requestData.nativeResultObject,
+-                    NetError.ERR_MISCONFIGURED_AUTH_ENVIRONMENT, null);
+-            return;
+-        }
+-
+-        requestData.accountManager.getAuthTokenByFeatures(mAccountType, requestData.authTokenType,
+-                features, activity, null, requestData.options, new GetTokenCallback(requestData),
+-                new Handler(ThreadUtils.getUiThreadLooper()));
++        // ditto
+     }
+ 
+     /**
+diff --git a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
+--- a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
++++ b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
+@@ -93,7 +93,6 @@ public class OAuthTokenFetcher {
+ 
+     /** Begins fetching a token. Should be called on the main thread. */
+     public void fetch() {
+-        fetchImpl(null);
+     }
+ 
+     /**
+@@ -102,7 +101,6 @@ public class OAuthTokenFetcher {
+      * @param expiredToken A previously-fetched token which has expired.
+      */
+     public void clearAndFetch(String expiredToken) {
+-        fetchImpl(expiredToken);
+     }
+ 
+     private void fetchImpl(final String expiredToken) {
+-- 
+2.11.0
+

build/patches/Remove-help-menu-item.patch

@@ -24,7 +24,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2177,15 +2177,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2143,15 +2143,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  
          final Tab currentTab = getActivityTab();
  

build/patches/kill-Auth.patch

@@ -138,7 +138,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon
      }
  
      @Override
-@@ -197,17 +164,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
+@@ -187,17 +154,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
      @SuppressLint("MissingPermission")
      @Override
      public void createAddAccountIntent(Callback<Intent> callback) {

build/patches/kill-GCM.patch

@@ -51,7 +51,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -81,22 +81,17 @@ by a child template that "extends" this file.
+@@ -75,22 +75,17 @@ by a child template that "extends" this file.
      <permission android:name="{{ manifest_package }}.permission.CHILD_SERVICE" android:protectionLevel="signature" />
      <permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKMARK_FOLDERS" android:protectionLevel="signatureOrSystem" />
      <permission android:name="{{ manifest_package }}.TOS_ACKED" android:protectionLevel="signatureOrSystem" />
@@ -73,8 +73,8 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
 -    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
      <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
  
-     <uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
-@@ -992,47 +987,8 @@ by a child template that "extends" this file.
+     {% block extra_uses_permissions %}
+@@ -984,47 +979,8 @@ by a child template that "extends" this file.
              android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
              android:hardwareAccelerated="false" />
  
@@ -122,7 +122,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
          <receiver android:name="com.google.ipc.invalidation.ticl.android2.AndroidInternalScheduler$AlarmReceiver"
              android:exported="false"/>
          <receiver android:name="com.google.ipc.invalidation.external.client.contrib.AndroidListener$AlarmReceiver"
-@@ -1059,24 +1015,6 @@ by a child template that "extends" this file.
+@@ -1051,24 +1007,6 @@ by a child template that "extends" this file.
              android:exported="false"
              android:permission="android.permission.BIND_JOB_SERVICE"/>
  

build/patches_list.txt

@@ -22,7 +22,7 @@ Skip-the-first-run-and-metrics.patch
 Disable-signin-and-data-saver-preferences.patch
 Disable-signin-data-reduction-promos.patch
 Remove-background-sync-and-translate-menu-options.patch
-Disable-sync-adaptive-service-from-manifest.patch
+Disable-unused-permissions.patch
 Never-send-any-crash-upload-data.patch
 Hide-send-reports-checkbox.patch
 Never-fetch-popular-sites.patch