Add Google and Startpage, make Startpage default search engine

browser/locales/en-US/chrome/browser-region/region.properties

@@ -3,14 +3,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Default search engine
-browser.search.defaultenginename=DuckDuckGo
+browser.search.defaultenginename=Startpage
 
 # Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=DuckDuckGo
-browser.search.order.2=DuckDuckGo (Lite)
-browser.search.order.3=Yahoo
-browser.search.order.4=Bing
-browser.search.order.5=Ecosia
+browser.search.order.1=Startpage
+browser.search.order.2=Google
+browser.search.order.3=DuckDuckGo (Lite)
+browser.search.order.4=Yahoo
+browser.search.order.5=Bing
+browser.search.order.6=Ecosia
 
 # This is the default set of web based feed handlers shown in the reader
 # selection UI

browser/locales/search/list.json

@@ -1,7 +1,7 @@
 {
   "default": {
     "visibleDefaultEngines": [
-      "ddg", "ddg-lite", "yahoo", "bing", "wikipedia"
+      "startpage", "google-2018", "ddg", "ddg-lite", "yahoo", "bing", "wikipedia"
     ]
   },
   "regionOverrides": {
@@ -10,7 +10,7 @@
     "en-US": {
       "default": {
         "visibleDefaultEngines": [
-          "ddg", "ddg-lite", "yahoo", "bing", "wikipedia"
+          "startpage", "google-2018", "ddg", "ddg-lite", "yahoo", "bing", "wikipedia"
         ]
       }
     },

browser/locales/searchplugins/startpage.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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>Startpage</ShortName>
+  <Description>Startpage Search</Description>
+  <InputEncoding>UTF-8</InputEncoding>
+  <Image width="16" height="16">data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHJlY3Qgd2lkdGg9IjE2IiBoZWlnaHQ9IjE2IiByeD0iMyIgZmlsbD0iIzNiNGI5YiIvPjxwYXRoIGQ9Ik0xMi41IDQuM0MxMS43IDMuNSAxMC41IDMgOC44IDMgNi42IDMgNSA0LjIgNSA1LjljMCAxLjggMS41IDIuNCAzLjIgMi45IDEuNC40IDIuMS43IDIuMSAxLjQgMCAuNi0uNiAxLTEuNSAxLTEgMC0xLjgtLjQtMi41LTEuMUw1IDExLjVjLjkgMSAyLjEgMS41IDMuOCAxLjUgMi4zIDAgMy43LTEuMiAzLjctMyAwLTEuOS0xLjUtMi41LTMuMy0zLTEuMy0uNC0yLS43LTItMS4zIDAtLjUuNS0uOCAxLjQtLjguOSAwIDEuNi4zIDIuMy45eiIgZmlsbD0id2hpdGUiLz48L3N2Zz4=</Image>
+  <Url type="text/html" method="GET" template="https://www.startpage.com/sp/search">
+    <Param name="query" value="{searchTerms}"/>
+  </Url>
+</SearchPlugin>