Merge #5059

5059: Ecosia r=pocmo a=mkaply

Add Ecosia search plugin for Germany.
Co-authored-by: Michael Kaply <345868+mkaply@users.noreply.github.com>

components/browser/search/src/main/assets/search/list.json

@@ -153,7 +153,7 @@
     "de": {
       "default": {
         "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-de", "ddg", "qwant", "twitter", "wikipedia-de"
+          "google-b-m", "bing", "amazon-de", "ddg", "ecosia", "qwant", "twitter", "wikipedia-de"
         ]
       }
     },

components/browser/search/src/main/assets/searchplugins/ecosia.xml

+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>Ecosia</ShortName>
+<InputEncoding>UTF-8</InputEncoding>
+<Image width="16" height="16">data:image/png;base64,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</Image>
+<Url type="application/x-suggestions+json" method="GET" template="https://ac.ecosia.org/autocomplete">
+  <Param name="q" value="{searchTerms}"/>
+  <Param name="type" value="list"/>
+</Url>
+<Url type="text/html" method="GET" template="https://www.ecosia.org/search">
+  <Param name="tt" value="813cf1dd-b"/>
+  <Param name="q" value="{searchTerms}"/>
+</Url>
+<SearchForm>https://www.ecosia.org/</SearchForm>
+</SearchPlugin>

components/browser/search/src/test/java/mozilla/components/browser/search/provider/AssetsSearchEngineProviderTest.kt

@@ -67,7 +67,7 @@ class AssetsSearchEngineProviderTest {
             val engines = searchEngineProvider.loadSearchEngines(testContext)
             val searchEngines = engines.list
 
-            assertEquals(7, searchEngines.size)
+            assertEquals(8, searchEngines.size)
             assertContainsSearchEngine("google-b-m", searchEngines)
             assertContainsNotSearchEngine("google-2018", searchEngines)
         }
@@ -81,7 +81,7 @@ class AssetsSearchEngineProviderTest {
             val engines = searchEngineProvider.loadSearchEngines(testContext)
             val searchEngines = engines.list
 
-            assertEquals(7, searchEngines.size)
+            assertEquals(8, searchEngines.size)
             assertContainsSearchEngine("google-b-1-m", searchEngines)
             assertContainsNotSearchEngine("google", searchEngines)
         }