Enabling SSL for search engines that now support it

components/search_engines/prepopulated_engines.json

Index: components/search_engines/prepopulated_engines.json
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
index 3409ecc4a77669499fe639d6b8e8866ef129251b..546a7a2f6add577c08bf67edb44fe846d993b639 100644
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -30,7 +30,7 @@
 
     // Increment this if you change the data in ways that mean users with
     // existing data should get a new version.
-    "kCurrentDataVersion": 97
+    "kCurrentDataVersion": 98
   },
 
   // The following engines are included in country lists and are added to the
@@ -39,8 +39,8 @@
     "aol": {
       "name": "AOL",
       "keyword": "aol.com",
-      "favicon_url": "http://search.aol.com/favicon.ico",
-      "search_url": "http://search.aol.com/aol/search?q={searchTerms}",
+      "favicon_url": "https://search.aol.com/favicon.ico",
+      "search_url": "https://search.aol.com/aol/search?q={searchTerms}",
       "suggest_url": "http://autocomplete.search.aol.com/autocomplete/get?output=json&it=&q={searchTerms}",
       "type": "SEARCH_ENGINE_AOL",
       "id": 35
@@ -78,8 +78,8 @@
     "baidu": {
       "name": "\u767e\u5ea6",
       "keyword": "baidu.com",
-      "favicon_url": "http://www.baidu.com/favicon.ico",
-      "search_url": "http://www.baidu.com/#ie={inputEncoding}&wd={searchTerms}",
+      "favicon_url": "https://www.baidu.com/favicon.ico",
+      "search_url": "https://www.baidu.com/#ie={inputEncoding}&wd={searchTerms}",
       "suggest_url": "http://suggestion.baidu.com/su?wd={searchTerms}&action=opensearch&ie={inputEncoding}",
       "type": "SEARCH_ENGINE_BAIDU",
       "id": 21
@@ -134,8 +134,8 @@
     "kvasir": {
       "name": "Kvasir",
       "keyword": "kvasir.no",
-      "favicon_url": "http://kvasir.no/grafikk/favicon.ico",
-      "search_url": "http://kvasir.no/alle?q={searchTerms}",
+      "favicon_url": "https://kvasir.no/grafikk/favicon.ico",
+      "search_url": "https://kvasir.no/alle?q={searchTerms}",
       "type": "SEARCH_ENGINE_KVASIR",
       "id": 73
     },
@@ -143,10 +143,10 @@
     "mail_ru": {
       "name": "@MAIL.RU",
       "keyword": "mail.ru",
-      "favicon_url": "http://go.imgsmail.ru/favicon.ico",
-      "search_url": "http://go.mail.ru/search?q={searchTerms}",
+      "favicon_url": "https://go.imgsmail.ru/favicon.ico",
+      "search_url": "https://go.mail.ru/search?q={searchTerms}",
       "encoding": "windows-1251",
-      "suggest_url": "http://suggests.go.mail.ru/chrome?q={searchTerms}",
+      "suggest_url": "https://suggests.go.mail.ru/chrome?q={searchTerms}",
       "type": "SEARCH_ENGINE_MAILRU",
       "id": 83
     },
@@ -154,8 +154,8 @@
     "najdi": {
       "name": "Najdi.si",
       "keyword": "najdi.si",
-      "favicon_url": "http://www.najdi.si/assets/PROD-1.4.10/ctx/images/favicon.ico",
-      "search_url": "http://www.najdi.si/search.jsp?q={searchTerms}",
+      "favicon_url": "https://www.najdi.si/assets/PROD-1.5.16/ctx/images/favicon.ico",
+      "search_url": "https://www.najdi.si/search.jsp?q={searchTerms}",
       "type": "SEARCH_ENGINE_NAJDI",
       "id": 87
     },
@@ -182,9 +182,9 @@
     "seznam": {
       "name": "Seznam",
       "keyword": "seznam.cz",
-      "favicon_url": "http://search.seznam.cz/r/img/favicon.ico",
-      "search_url": "http://search.seznam.cz/?q={searchTerms}",
-      "suggest_url": "http://suggest.fulltext.seznam.cz/fulltext_ff?phrase={searchTerms}",
+      "favicon_url": "https://search.seznam.cz/r/img/favicon.ico",
+      "search_url": "https://search.seznam.cz/?q={searchTerms}",
+      "suggest_url": "https://suggest.fulltext.seznam.cz/fulltext_ff?phrase={searchTerms}",
       "type": "SEARCH_ENGINE_SEZNAM",
       "id": 25
     },
@@ -212,8 +212,8 @@
     "vinden": {
       "name": "Vinden.nl",
       "keyword": "vinden.nl",
-      "favicon_url": "http://www.vinden.nl/favicon.ico",
-      "search_url": "http://www.vinden.nl/?q={searchTerms}",
+      "favicon_url": "https://www.vinden.nl/favicon.ico",
+      "search_url": "https://www.vinden.nl/?q={searchTerms}",
       "type": "SEARCH_ENGINE_VINDEN",
       "id": 53
     },
@@ -412,9 +412,9 @@
     "yahoo_jp": {
       "name": "Yahoo! JAPAN",
       "keyword": "yahoo.co.jp",
-      "favicon_url": "http://search.yahoo.co.jp/favicon.ico",
-      "search_url": "http://search.yahoo.co.jp/search?ei={inputEncoding}&fr=crmas&p={searchTerms}",
-      "suggest_url": "http://search.yahooapis.jp/AssistSearchService/V2/webassistSearch?p={searchTerms}&appid=oQsoxcyxg66enp0TYoirkKoryq6rF8bK76mW0KYxZ0v0WPLtn.Lix6wy8F_LwGWHUII-&output=fxjson&fr=crmas",
+      "favicon_url": "https://search.yahoo.co.jp/favicon.ico",
+      "search_url": "https://search.yahoo.co.jp/search?ei={inputEncoding}&fr=crmas&p={searchTerms}",
+      "suggest_url": "https://search.yahooapis.jp/AssistSearchService/V2/webassistSearch?p={searchTerms}&appid=oQsoxcyxg66enp0TYoirkKoryq6rF8bK76mW0KYxZ0v0WPLtn.Lix6wy8F_LwGWHUII-&output=fxjson&fr=crmas",
       "type": "SEARCH_ENGINE_YAHOO",
       "id": 2
     },
@@ -679,11 +679,11 @@
     "avg": {
       "name": "AVG",
       "keyword": "search.avg.com",
-      "favicon_url": "http://search.avg.com/favicon.ico",
-      "search_url": "http://search.avg.com/search?q={searchTerms}",
+      "favicon_url": "https://search.avg.com/favicon.ico",
+      "search_url": "https://search.avg.com/search?q={searchTerms}",

[Peter Kasting, 2017/03/18 01:03:54]

For all the engines from here down, we ship the engine just to monitor
extensions that try to set user preferences to it (since these have showed up in
malicious cases).

I would probably not change the default favicon/search/suggest URLs for these
unless those engines redirect to them and/or ship an OSDD that specifies them. 
(AVG, for example, does neither.)  Instead, I would just add the https search
URLs to the existing HTTP URLs in the "alternate_urls" list.

For any cases where you do change the defaults, I'd add the old HTTP URLs to the
alternates list.

[yakovsh, 2017/03/21 02:10:38]

I updated these accordingly. 

For Rambler and search.goo.net.jp, the OSD document changed and I updated based
on the OSD. For all others, I added HTTPS URLS as alternates.

       "alternate_urls": [
-        "http://isearch.avg.com/search?q={searchTerms}",
-        "http://search.avg.com/route/?q={searchTerms}&lng={language}"
+        "https://isearch.avg.com/search?q={searchTerms}",
+        "https://search.avg.com/route/?q={searchTerms}&lng={language}"
       ],
       "type": "SEARCH_ENGINE_AVG",
       "id": 50
@@ -767,9 +767,9 @@
     "goo": {
       "name": "goo",
       "keyword": "search.goo.ne.jp",
-      "favicon_url": "http://goo.ne.jp/favicon.ico",
-      "search_url": "http://search.goo.ne.jp/web.jsp?MT={searchTerms}&IE={inputEncoding}",
-      "suggest_url": "http://search.goo.ne.jp/sgt.jsp?MT={searchTerms}&CL=plugin&FM=json&IE={inputEncoding}",
+      "favicon_url": "https://goo.ne.jp/favicon.ico",
+      "search_url": "https://search.goo.ne.jp/web.jsp?MT={searchTerms}&IE={inputEncoding}",
+      "suggest_url": "https://search.goo.ne.jp/sgt.jsp?MT={searchTerms}&CL=plugin&FM=json&IE={inputEncoding}",
       "encoding": "EUC-JP",
       "type": "SEARCH_ENGINE_GOO",
       "id": 23
@@ -834,9 +834,9 @@
     "neti": {
       "name": "NETI",
       "keyword": "neti.ee",
-      "favicon_url": "http://www.neti.ee/favicon.ico",
-      "search_url": "http://www.neti.ee/cgi-bin/otsing?query={searchTerms}",
-      "suggest_url": "http://www.neti.ee/api/suggestOS?suggestQuery={searchTerms}",
+      "favicon_url": "https://www.neti.ee/favicon.ico",
+      "search_url": "https://www.neti.ee/cgi-bin/otsing?query={searchTerms}",
+      "suggest_url": "https://www.neti.ee/api/suggestOS?suggestQuery={searchTerms}",
       "encoding": "ISO-8859-1",
       "type": "SEARCH_ENGINE_NETI",
       "id": 44
@@ -865,9 +865,9 @@
     "rambler": {
       "name": "\u0420\u0430\u043c\u0431\u043b\u0435\u0440",
       "keyword": "rambler.ru",
-      "favicon_url": "http://nova.rambler.ru/static/blocks/images/favicon.ico",
-      "search_url": "http://nova.rambler.ru/search?query={searchTerms}",
-      "suggest_url": "http://nova.rambler.ru/suggest?v=3&query={searchTerms}",
+      "favicon_url": "https://search.rambler.su/static/search/120/images/favicon.ico",
+      "search_url": "https://nova.rambler.ru/search?query={searchTerms}",
+      "suggest_url": "https://nova.rambler.ru/suggest?v=3&query={searchTerms}",
       "type": "SEARCH_ENGINE_RAMBLER",
       "id": 16
     },
@@ -920,14 +920,14 @@
     "softonic": {
       "name": "softonic",
       "keyword": "search.softonic.com",
-      "favicon_url": "http://search.softonic.com/img/favicon.ico",
-      "search_url": "http://search.softonic.com/?q={searchTerms}",
+      "favicon_url": "https://search.softonic.com/img/favicon.ico",
+      "search_url": "https://search.softonic.com/?q={searchTerms}",
       "alternate_urls": [
-        "http://en.softonic.com/s/{searchTerms}",
-        "http://www.softonic.com/s/{searchTerms}",
-        "http://www.softonic.com.br/s/{searchTerms}",
-        "http://buscador.softonic.com/?q={searchTerms}",
-        "http://nl.softonic.com/s/{searchTerms}"
+        "https://en.softonic.com/s/{searchTerms}",
+        "https://www.softonic.com/s/{searchTerms}",
+        "https://www.softonic.com.br/s/{searchTerms}",
+        "https://buscador.softonic.com/?q={searchTerms}",
+        "https://nl.softonic.com/s/{searchTerms}"
       ],
       "type": "SEARCH_ENGINE_SOFTONIC",
       "id": 80
@@ -958,8 +958,8 @@
     "terra_ar": {
       "name": "Terra Argentina",
       "keyword": "terra.com.ar",
-      "favicon_url": "http://buscar.terra.com.ar/favicon.ico",
-      "search_url": "http://buscar.terra.com.ar/Default.aspx?source=Search&ca=s&query={searchTerms}",
+      "favicon_url": "https://buscador.terra.com.ar/favicon.ico",
+      "search_url": "https://buscador.terra.com.ar/Default.aspx?source=Search&ca=s&query={searchTerms}",
       "encoding": "ISO-8859-1",
       "type": "SEARCH_ENGINE_TERRA",
       "id": 90
@@ -968,8 +968,8 @@
     "terra_es": {
       "name": "Terra",
       "keyword": "terra.es",
-      "favicon_url": "http://buscador.terra.es/favicon.ico",
-      "search_url": "http://buscador.terra.es/Default.aspx?source=Search&ca=s&query={searchTerms}",
+      "favicon_url": "https://buscador.terra.es/favicon.ico",
+      "search_url": "https://buscador.terra.es/Default.aspx?source=Search&ca=s&query={searchTerms}",
       "encoding": "ISO-8859-1",
       "type": "SEARCH_ENGINE_TERRA",
       "id": 90
@@ -988,8 +988,8 @@
     "walla": {
       "name": "\u05d5\u05d5\u05d0\u05dc\u05d4!",
       "keyword": "walla.co.il",
-      "favicon_url": "http://www.walla.co.il/favicon.ico",
-      "search_url": "http://search.walla.co.il/?q={searchTerms}",
+      "favicon_url": "https://www.walla.co.il/favicon.ico",
+      "search_url": "https://search.walla.co.il/?q={searchTerms}",
       "type": "SEARCH_ENGINE_WALLA",
       "id": 55
     },