Merge m-i to m-c, a=merge

MozReview-Commit-ID: J2Mx0f21eBE
dothq · Nov 1, 2016 · 56dcb26 · 56dcb26
2 parents 5040f17 + 851bd95
commit 56dcb26
Show file tree

Hide file tree

Showing 430 changed files with 17,369 additions and 2,385 deletions.
diff --git a/browser/base/content/sanitizeDialog.js b/browser/base/content/sanitizeDialog.js
@@ -644,13 +644,13 @@ var gContiguousSelectionTreeHelper = {
     // drag and drop.  Start a move drag session with dummy data and a
     // dummy region.  Set the region's coordinates to (Infinity, Infinity)
     // so it's drawn offscreen and its size to (1, 1).
-    var arr = Cc["@mozilla.org/supports-array;1"].
-              createInstance(Ci.nsISupportsArray);
+    var arr = Cc["@mozilla.org/array;1"].
+              createInstance(Ci.nsIMutableArray);
     var trans = Cc["@mozilla.org/widget/transferable;1"].
                 createInstance(Ci.nsITransferable);
     trans.init(null);
     trans.setTransferData('dummy-flavor', null, 0);
-    arr.AppendElement(trans);
+    arr.appendElement(trans, /* weak = */ false);
     var reg = Cc["@mozilla.org/gfx/region;1"].
               createInstance(Ci.nsIScriptableRegion);
     reg.setToRect(Infinity, Infinity, 1, 1);

diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js
@@ -622,6 +622,12 @@ var WebBrowserChrome = {
 
     return true;
   },
+
+  // Try to reload the currently active or currently loading page in a new process.
+  reloadInFreshProcess: function(aDocShell, aURI, aReferrer) {
+    E10SUtils.redirectLoad(aDocShell, aURI, aReferrer, true);
+    return true;
+  }
 };
 
 if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) {

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
@@ -1659,6 +1659,7 @@
         <parameter name="aBrowser"/>
         <parameter name="aShouldBeRemote"/>
         <parameter name="aOpener"/>
+        <parameter name="aFreshProcess"/>
         <body>
           <![CDATA[
             let isRemote = aBrowser.getAttribute("remote") == "true";
@@ -1676,7 +1677,7 @@
             }
 
             // Abort if we're not going to change anything
-            if (isRemote == aShouldBeRemote) {
+            if (isRemote == aShouldBeRemote && !aFreshProcess) {
               return false;
             }
 
@@ -1723,8 +1724,18 @@
             // loader is created the opener is set correctly.
             aBrowser.presetOpenerWindow(aOpener);
 
+            // Set the freshProcess attribute so that the frameloader knows to
+            // create a new process
+            if (aFreshProcess) {
+              aBrowser.setAttribute("freshProcess", "true");
+            }
+
             parent.appendChild(aBrowser);
 
+            // Remove the freshProcess attribute if we set it, as we don't
+            // want it to apply for the next time the frameloader is created
+            aBrowser.removeAttribute("freshProcess");
+
             aBrowser.userTypedValue = oldUserTypedValue;
             if (hadStartedLoad) {
               aBrowser.urlbarChangeTracker.startedLoad();
@@ -1787,6 +1798,22 @@
         </body>
       </method>
 
+      <method name="switchBrowserIntoFreshProcess">
+        <parameter name="aBrowser"/>
+        <body>
+          <![CDATA[
+            if (!gMultiProcessBrowser) {
+              return this.updateBrowserRemoteness(aBrowser, false);
+            }
+
+            return this.updateBrowserRemoteness(aBrowser,
+                                                /* aShouldBeRemote */ true,
+                                                /* aOpener */ null,
+                                                /* aFreshProcess */ true);
+          ]]>
+        </body>
+      </method>
+
       <method name="updateBrowserRemotenessByURL">
         <parameter name="aBrowser"/>
         <parameter name="aURL"/>

diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm
@@ -2614,7 +2614,13 @@ var SessionStoreInternal = {
       }
 
       let tabState = TabState.clone(tab);
-      let options = {restoreImmediately: true};
+      let options = {
+        restoreImmediately: true,
+        // We want to make sure that this information is passed to restoreTab
+        // whether or not a historyIndex is passed in. Thus, we extract it from
+        // the loadArguments.
+        reloadInFreshProcess: !!recentLoadArguments.reloadInFreshProcess,
+      };
 
       if (historyIndex >= 0) {
         tabState.index = historyIndex + 1;
@@ -3274,6 +3280,7 @@ var SessionStoreInternal = {
     let window = tab.ownerGlobal;
     let tabbrowser = window.gBrowser;
     let forceOnDemand = options.forceOnDemand;
+    let reloadInFreshProcess = options.reloadInFreshProcess;
 
     let willRestoreImmediately = restoreImmediately ||
                                  tabbrowser.selectedBrowser == browser ||
@@ -3396,7 +3403,7 @@ var SessionStoreInternal = {
     // This could cause us to ignore MAX_CONCURRENT_TAB_RESTORES a bit, but
     // it ensures each window will have its selected tab loaded.
     if (willRestoreImmediately) {
-      this.restoreTabContent(tab, loadArguments);
+      this.restoreTabContent(tab, loadArguments, reloadInFreshProcess);
     } else if (!forceOnDemand) {
       this.restoreNextTab();
     }
@@ -3412,11 +3419,10 @@ var SessionStoreInternal = {
    *        the tab to restore
    * @param aLoadArguments
    *        optional load arguments used for loadURI()
-   * @param aRemotenessSwitch
-   *        true if we're restoring a tab's content because we flipped
-   *        its remoteness (out-of-process) state.
+   * @param aReloadInFreshProcess
+   *        true if we want to reload into a fresh process
    */
-  restoreTabContent: function (aTab, aLoadArguments = null) {
+  restoreTabContent: function (aTab, aLoadArguments = null, aReloadInFreshProcess = false) {
     if (aTab.hasAttribute("customizemode")) {
       return;
     }
@@ -3441,7 +3447,13 @@ var SessionStoreInternal = {
     // flip the remoteness of any browser that is not being displayed.
     this.markTabAsRestoring(aTab);
 
-    let isRemotenessUpdate = tabbrowser.updateBrowserRemotenessByURL(browser, uri);
+    let isRemotenessUpdate = false;
+    if (aReloadInFreshProcess) {
+      isRemotenessUpdate = tabbrowser.switchBrowserIntoFreshProcess(browser);
+    } else {
+      isRemotenessUpdate = tabbrowser.updateBrowserRemotenessByURL(browser, uri);
+    }
+
     if (isRemotenessUpdate) {
       // We updated the remoteness, so we need to send the history down again.
       //

diff --git a/browser/extensions/aushelper/bootstrap.js b/browser/extensions/aushelper/bootstrap.js
@@ -59,7 +59,7 @@ function startup() {
   }
 
   let microCodeVersions = [0xe, 0x11, 0x12, 0x13, 0x16, 0x18, 0x19];
-  let cpuRevMatch = false;
+  let cpuRevMatch = null;
   try {
     let keyNames = ["Update Revision", "Update Signature"];
     for (let i = 0; i < keyNames.length; ++i) {
@@ -76,6 +76,7 @@ function startup() {
             }
             hexVal.unshift(c);
           }
+          cpuRevMatch = false;
           if (microCodeVersions.indexOf(parseInt(hexVal.join(''))) != -1) {
             cpuRevMatch = true;
           }

diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
@@ -64,7 +64,7 @@ endif
 SEARCHPLUGINS_FILENAMES := $(shell $(call py_action,output_searchplugins_list,$(srcdir)/search/list.json $(AB_CD)))
 SEARCHPLUGINS_PATH := .deps/generated_$(AB_CD)
 SEARCHPLUGINS_TARGET := libs searchplugins
-SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_FILENAMES)),$(or $(wildcard $(call EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(warning Missing searchplugin: $(plugin))))
+SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_FILENAMES)),$(or $(wildcard $(srcdir)/searchplugins/$(plugin)),$(warning Missing searchplugin: $(plugin))))
 # Some locale-specific search plugins may have preprocessor directives, but the
 # default en-US ones do not.
 SEARCHPLUGINS_FLAGS := --silence-missing-directive-warnings

diff --git a/browser/locales/search/list.json b/browser/locales/search/list.json
@@ -142,7 +142,7 @@
     "da": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "bing", "amazon-co-uk", "ddg", "wikipedia-da"
+          "google", "bing", "amazon-en-GB", "ddg", "wikipedia-da"
         ]
       }
     },
@@ -394,32 +394,32 @@
     "kk": {
       "default": {
         "visibleDefaultEngines": [
-          "yandex", "google", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
+          "yandex-kk", "google", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
         ]
       },
       "KZ": {
         "visibleDefaultEngines": [
-          "yandex", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
+          "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
         ]
       },
       "BY": {
         "visibleDefaultEngines": [
-          "yandex", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
+          "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
         ]
       },
       "RU": {
         "visibleDefaultEngines": [
-          "yandex", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
+          "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
         ]
       },
       "TR": {
         "visibleDefaultEngines": [
-          "yandex", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
+          "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
         ]
       },
       "UA": {
         "visibleDefaultEngines": [
-          "yandex", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
+          "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
         ]
       }
     },
@@ -566,21 +566,21 @@
     "pt-BR": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-br", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-br"
+          "google", "yahoo-br", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt"
         ]
       }
     },
     "pt-PT": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "amazon-en-GB", "ddg", "priberam", "sapo", "wikipedia-ptpt"
+          "google", "amazon-en-GB", "ddg", "priberam", "sapo", "wikipedia-pt"
         ]
       }
     },
     "rm": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yahoo-ch", "bing", "ddg", "leo_ende_de", "pledarigrond", "wikipedia-rm"
+          "google", "yahoo-ch", "bing", "ddg", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm"
         ]
       }
     },
@@ -594,32 +594,32 @@
     "ru": {
       "default": {
         "visibleDefaultEngines": [
-          "yandex", "google", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
+          "yandex-ru", "google", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
         ]
       },
       "RU": {
         "visibleDefaultEngines": [
-          "yandex", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
+          "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
         ]
       },
       "BY": {
         "visibleDefaultEngines": [
-          "yandex", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
+          "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
         ]
       },
       "KZ": {
         "visibleDefaultEngines": [
-          "yandex", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
+          "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
         ]
       },
       "TR": {
         "visibleDefaultEngines": [
-          "yandex", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
+          "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
         ]
       },
       "UA": {
         "visibleDefaultEngines": [
-          "yandex", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
+          "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
         ]
       }
     },
@@ -735,32 +735,32 @@
     "uk": {
       "default": {
         "visibleDefaultEngines": [
-          "google", "yandex", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
+          "google", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
         ]
       },
       "UA": {
         "visibleDefaultEngines": [
-          "google-nocodes", "yandex", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
+          "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
         ]
       },
       "TR": {
         "visibleDefaultEngines": [
-          "google-nocodes", "yandex", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
+          "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
         ]
       },
       "BY": {
         "visibleDefaultEngines": [
-          "google-nocodes", "yandex", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
+          "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
         ]
       },
       "KZ": {
         "visibleDefaultEngines": [
-          "google-nocodes", "yandex", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
+          "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
         ]
       },
       "RU": {
         "visibleDefaultEngines": [
-          "google-nocodes", "yandex", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
+          "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
         ]
       }
     },

diff --git a/browser/locales/searchplugins/allaannonser-sv-SE.xml b/browser/locales/searchplugins/allaannonser-sv-SE.xml
@@ -0,0 +1,17 @@
+<!-- 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>Allaannonser</ShortName>
+<Description>Allaannonser</Description>
+<InputEncoding>ISO-8859-1</InputEncoding>
+<Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAABnRSTlMA/wD/AP83WBt9AAAACXBIWXMAAAsTAAALEwEAmpwYAAACPElEQVR42nVSS0iUYRQ995tfZ8YZlXF8gqUWUlJgkwUV0cKwRe3ctzDa9Ni1DqKNWtSih1QGtqkWgRa50VW1EMLUENNBMXXKsRpH/Wd0nv//nRZjmUJndeEeOOeee4QkdoCElWAsDHeJFPh3LI2tMR1DZJLD98Wcp8Mp5gKchTx5HW6/lB2ApyzHkpwCU6t4fR7LXyT2HeKAMgCANrQF5WDTFTndAZX3RyETx/AD+ToAZbCuBY1tqDoKpfBrAuM9MjuAsSe0UnLqBjxlIKmDb9jpZWeh/nCTiRX+i3RcjzzinVK2u/T8O5IKABMRWGnub5Vj1+D2bbsx3yuNbWy6DGqEh3M+Lf3iDG8VazPE/0Cn47xXw+4A03HF1KqY31gRkMJqBvv0xMttCX9+xum3ku/l3rNIrnBt3kBmHXYWvj0QQTKKbGKbpUQEIgDgrYKdkUzcgDIgCtl1ABK4iGxSR2ekwA/DxfiSHLqw+Ts7AxEqh4GCUriKEf5EKy3KQLBPR6cBQjlhp8RbqRpa4SlH6D2cRSjarcRwsa5FNpYQ7AXA6hPKXaJ+jKrFIWWlUNuMfC8WP8rPMVYcFk85SOrIFLv2satBRya1bZHUs4P2+HNqW2tbx8LsOc67lTo0RBK53PR0P2/7+LBejz7VG8s6saITUZ0y9VQvuwPscOuRx9QWyc0ugTYnX8lQO8wQimvp9kNEkqswF+D28chVaboER95W+TZTX5vDTD9mB2HOgRpFu1DTjPpzUn7wL+c37UxbeDY2F2wAAAAASUVORK5CYII=</Image>
+<Url type="text/html" method="GET" template="http://www.allaannonser.se/hitlist.php" resultdomain="allaannonser.se">
+  <Param name="sourceid" value="Mozilla-search"/>
+  <Param name="keyword" value="{searchTerms}"/>
+  <Param name="order" value="date"/>
+  <Param name="desc" value="1"/>
+</Url>
+<SearchForm>http://www.allaannonser.se</SearchForm>
+</SearchPlugin>
diff --git a/browser/locales/searchplugins/allegro-pl.xml b/browser/locales/searchplugins/allegro-pl.xml
@@ -0,0 +1,17 @@
+<!-- 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>Allegro</ShortName>
+<Description>Wyszukiwanie w aukcjach Allegro</Description>
+<InputEncoding>UTF-8</InputEncoding>
+ <Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AAFr/OgBa/zkAWv84AFr/OABa/zgAWv85AFr/PABa/wn///8A////AP///wD///8A////AABa/xYAWv+4AFr//wBa//8AWv//AFr//wBa//8AWv//AFr//wBa//8AWv+H////AP///wD///8A////AP///wAAWv/wAFr//wBa//8AWv//AFr//wBa//8AWv//AFr//wBa//8AWv//AFr/gv///wD///8A////AP///wAAWv9MAFr//wBa//8AWv//AFr/ewBa/zUAWv82AFr/NABa/2YAWv//AFr//wBa/4H///8A////AP///wD///8AAFr/gwBa//8AWv//AFr/if///wD///8A////AP///wAAWv8yAFr//wBa//8AWv+A////AP///wD///8A////AABa/4MAWv//AFr//wBa/8L///8A////AP///wD///8AAFr/MQBa//8AWv//AFr/gP///wD///8A////AP///wAAWv8oAFr//wBa//8AWv//AFr/xABa/34AWv9/AFr/fQBa/5sAWv//AFr//wBa/4D///8A////AP///wD///8A////AABa/5QAWv//AFr//wBa//8AWv//AFr//wBa//8AWv//AFr//wBa//8AWv+A////AP///wD///8A////AP///wD///8AAFr/NwBa/7UAWv//AFr//wBa//8AWv//AFr//wBa//8AWv//AFr/gf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AABa/2IAWv//AFr//wBa/4L///8A////AP///wD///8A////AP///wAAWv/RAFr/ywBa/0b///8A////AABa/woAWv/mAFr//wBa//8AWv85////AP///wD///8A////AP///wD///8AAFr//wBa//8AWv//AFr//wBa//8AWv//AFr//wBa//8AWv/v////AP///wD///8A////AP///wD///8A////AABa/5gAWv//AFr//wBa//8AWv//AFr//wBa//8AWv//AFr/J////wD///8A////AP///wD///8A////AP///wD///8AAFr/FgBa/14AWv+CAFr/gQBa/4IAWv9eAFr/BP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A//8AAP//AADwAwAA4AMAAOPjAADD4wAAw+MAAOHDAADgAwAA+AMAAP/jAADzxwAA8AcAAPAPAAD+PwAA//8AAA==</Image>
+ <SearchForm>http://allegro.pl</SearchForm>
+ <Url method="GET"
+      template="http://allegro.pl/listing/listing.php"
+      type="text/html">
+  <Param name="string" value="{searchTerms}" />
+  <Param name="sourceid" value="Mozilla-search" />
+ </Url>
+</SearchPlugin>
diff --git a/browser/locales/searchplugins/amazon-en-GB.xml b/browser/locales/searchplugins/amazon-en-GB.xml
@@ -0,0 +1,17 @@
+<!-- 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>Amazon.co.uk</ShortName>
+<Description>Amazon.co.uk Search</Description>
+<InputEncoding>ISO-8859-1</InputEncoding>
+<Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAAAAAC0AQAAJgAAACAgAAAAAAAA6QIAANoBAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAF7SURBVDjLlZPLasJAFIaFRF+iVV+h6hO0GF+gVB9AaHwDt64qCG03tQgtdCFIuyhUelmGli66MXThSt24kNiFBUlAYi6ezjnNxSuawB/ITP7v/HNmJgQAEaZzpgHs/gwcTyTEXuXl2U6nA8ViEbK5HKler28CVRAwnB9ptVrAh8MrQuCaZ4iA8fzIqSgCxwzpTIaSuN/RWGwdYLwCUBQFZFkGSZLgqdmEE7YEN8VOAKyaSKUW4nNBAFmnYiKZpDRX1WqwBBzP089n5f/NEQsFL4WqqtsBWJlzDAJr5PwSMM1awEzzdxIbGI3Hvc6jCZeVFgRQRwpY7Qcw3ktgfpR8wLRxCPaot/X4GS95MppfF6DX9n2A3f+kAZycaT8bAZjU6r6B/duD6d3BYg9wQq/tkYzHY1blEiz5lmQyGc95mrO6r2CxgpjCBXgNsJVviolpXJiraeOIjJRE10juUa4sR8V+mO17VvmGqtuOcdNlwut8zTQJcJ0njifyB2bgTdKh6w4BAAAAAElFTkSuQmCCiVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACsElEQVRYw71XQWsTURBe2LQgeNKLB+tVemt6txcteNSD/QGC6VEIGDx5s+eKPQqFgJhLNdFLBWMP7cU0oSAWjB70koC9WHbVQ5SO8+XtS14mr7svyaYDH9m87Jv55puZt1nPi4yIzjMeMj7T9OwjI88455nGC1cZX+nsDESumJmPFDwIAqrX6z00Gg1qt9vjkJgFgUeuO16Vy3RjeZkyMzM9+MY1fsM9I9h9zyV7ZAznZrA4FAoFVwJ1z+WuOysrg1lnMolkHJX4k0igzI5sARYWF7vEZEk0rvO6iyUSuJfLJUqM7zYSqRDIra4OOUZPmNZsNrsl8UVTpkJAjh1GzmaSpJ8mAWmYeZB5urHRhW5SNOfUCCDo47W1bvPZsp2qAhipy3Nz1kaLG8dUCEBqM5AvpgElqFar01NgIZsdco7Zb7VasU2YigIYL5tjqCL7Q5YkFQXKlcqQ7DbHthIALk/IWAKor82xPIhshxWABCYioDMz51sexcVi0XoG4DPLIyvJjkTArK3scDQnRvO0MdTrUHGiKZCP4tNgO6BAEI08EQH9Z2Qow0hyPypJGIa9p6JWKCn4SA8jSKmJIDgyRvPJkcRxjfUwNGr/i8+Mo32iHzWiThBD4NM60bet9P77/ubA728RlTjMiwiH6zEEfvIrwdZFtQmMJ7W/ofIDBZD5m3mVZGwJcOP2kmILIlCkE45HoPWurwCSg0+UQRD4ZyXxId+T7gQb9+4q9sioY5ltrOG3L5vqXiiJffDx/aUi83ZJ7jr2ohcEu8Hh6/m+I7OWGiVxbWKHsz+O3vSOakqFQdsFgQeJUiKD7Wv9YKXBgCeSUC3v2kM5EJhlHDh3NcgcPlG1BXZu98sDmTuBa4fsMnz9fniJUaGzs+eMC540XuR0aDO2L8Y3qPyMcdOM+R/8XcqRA3qp9gAAAABJRU5ErkJggg==</Image>
+<Url type="text/html" method="GET" template="https://www.amazon.co.uk/exec/obidos/external-search/" resultdomain="amazon.co.uk">
+  <Param name="field-keywords" value="{searchTerms}"/>
+  <Param name="mode" value="blended"/>
+  <Param name="tag" value="firefox-uk-21"/>
+  <Param name="sourceid" value="Mozilla-search"/>
+</Url>
+<SearchForm>https://www.amazon.co.uk/</SearchForm>
+</SearchPlugin>