diff --git a/allmakefiles.sh b/allmakefiles.sh
index 4a3eb740ee7..b334b7eef10 100755
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -916,6 +916,7 @@ browser/components/migration/Makefile
 browser/components/migration/public/Makefile
 browser/components/migration/src/Makefile
 browser/components/preferences/Makefile
+browser/components/search/Makefile
 browser/components/sidebar/Makefile
 browser/components/sidebar/src/Makefile
 browser/components/shell/Makefile
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 2860e8305ca..df0aded107e 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -205,8 +205,10 @@ pref("browser.download.manager.flashCount", 2);
 
 // pointer to the default engine name
 pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
-// pointer to the Web Search url (content area context menu)
-pref("browser.search.defaulturl",             "chrome://browser-region/locale/region.properties");
+
+// disable logging for the search service by default
+pref("browser.search.log", false);
+
 // Ordering of Search Engines in the Engine list. 
 pref("browser.search.order.1",                "chrome://browser-region/locale/region.properties");
 pref("browser.search.order.2",                "chrome://browser-region/locale/region.properties");
@@ -217,10 +219,6 @@ pref("browser.search.order.Yahoo.1",          "chrome://branding/content/searchc
 pref("browser.search.order.Yahoo.2",          "chrome://branding/content/searchconfig.properties");
 pref("browser.search.order.Yahoo",            "chrome://branding/content/searchconfig.properties");
 
-// basic search popup constraint: minimum sherlock plugin version displayed
-// (note: must be a string representation of a float or it'll default to 0.0)
-pref("browser.search.basic.min_ver", "0.0");
-
 // search bar results always open in a new tab
 pref("browser.search.openintab", false);
 
diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
index ff700787e49..74b8f18b7b0 100644
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -198,7 +198,7 @@
                 oncommand="AddKeywordForSearchField();"/>
       <menuitem id="context-searchselect"
                 accesskey="&search.accesskey;"
-                oncommand="OpenSearch('internet', gContextMenu.searchSelected(), true);"/>
+                oncommand="BrowserSearch.loadSearch(getBrowserSelection(), true);"/>
       <menuseparator id="frame-sep"/>
       <menu id="frame" label="&thisFrameMenu.label;" accesskey="&thisFrameMenu.accesskey;">
         <menupopup>
@@ -262,4 +262,3 @@
                 accesskey="&bidiSwitchPageDirectionItem.accesskey;"
                 oncommand="SwitchDocumentDirection(window.content);"/>
     </popup>
-
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 89359cd31a5..acae0007ce6 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -406,7 +406,7 @@
 
 #ifndef MOZ_PLACES
             <menu id="bookmarks-menu" label="&bookmarksMenu.label;" accesskey="&bookmarksMenu.accesskey;"
-                  datasources="rdf:bookmarks rdf:files rdf:localsearch" 
+                  datasources="rdf:bookmarks rdf:files" 
                   ref="NC:BookmarksRoot" flags="dont-test-empty"
                   template='bookmarks-template'
                   infer="forward-proxy"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index cab90c5d8f5..2daa0df4079 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -163,7 +163,7 @@
     <command id="cmd_textZoomReset" oncommand="ZoomManager.prototype.getInstance().reset();"/>
     <command id="Browser:OpenLocation" oncommand="openLocation();"/>
 
-    <command id="Tools:Search" oncommand="WebSearch();"/>    
+    <command id="Tools:Search" oncommand="BrowserSearch.webSearch();"/>    
     <command id="Tools:Downloads" oncommand="toOpenWindowByType('Download:Manager', 
                                                                 'chrome://mozapps/content/downloads/downloads.xul',
                                                                 'chrome,dialog=no,resizable');"/>
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index d83358275a7..a3285e520d9 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -1,5 +1,5 @@
 searchbar {
-  -moz-binding: url("chrome://browser/content/search.xml#searchbar");
+  -moz-binding: url("chrome://browser/content/search/search.xml#searchbar");
 }
 
 /* ::::: print preview toolbar ::::: */
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index ed35a67d1ae..a73533a1d6f 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1806,27 +1806,6 @@ function BrowserLoadURL(aTriggeringEvent, aPostData)
   content.focus();
 }
 
-function delayedSearchLoadURL(aURL, aInNewTab) {
-  setTimeout(SearchLoadURL, 0, aURL, aInNewTab);
-}
-
-function SearchLoadURL(aURL, aInNewTab)
-{
-  if (!aURL)
-    return;
-
-  if (gBrowser.localName == "tabbrowser" && aInNewTab) {
-    content.focus();
-    // Modal action, remember last viewed tab
-    gBrowser.loadOneTab(aURL, null, null, null, false);
-    if (gURLBar)
-      gURLBar.value = aURL;
-  }
-  else
-    loadURI(aURL, null, null);
-  content.focus();
-}
-
 function getShortcutOrURI(aURL, aPostDataRef)
 {
   // rjc: added support for URL shortcuts (3/30/1999)
@@ -2788,107 +2767,83 @@ var DownloadsButtonDNDObserver = {
   }
 }
 
-function WebSearch()
-{
+const BrowserSearch = {
+  /**
+   * Gives focus to the search bar, if it is present on the toolbar, or loads
+   * the default engine's search form otherwise. For Mac, opens a new window
+   * or focuses an existing window, if necessary.
+   */
+  webSearch: function BrowserSearch_webSearch() {
 #ifdef XP_MACOSX
-  if (window.location.href != getBrowserURL()) {
-    var win = getTopWin();
-    if (win) {
-      // If there's an open browser window, it should handle this command
-      win.focus()
-      win.WebSearch();
-    }
-    else {
-      // If there are no open browser windows, open a new one
-      win = window.openDialog("chrome://browser/content/", "_blank",
-                              "chrome,all,dialog=no", "about:blank");
-      win.addEventListener("load", WebSearchCallback, false);
-    }
-    return;
-  }
-#endif
-  var searchBar = document.getElementById("searchbar");
-  if (searchBar && !searchBar.parentNode.parentNode.collapsed &&
-      !(window.getComputedStyle(searchBar.parentNode, null).display == "none")) {
-    searchBar.select();
-    searchBar.focus();
-  } else {
-    openDialog("chrome://browser/content/searchDialog.xul", "",
-               "chrome,dialog,resizable,modal");
-  }
-}
-
-function WebSearchCallback() {
-  // make sure the DOM is ready
-  setTimeout(function() { this.WebSearch(); }, 0);
-}
-
-function OpenSearch(tabName, searchStr, newTabFlag)
-{
-  //This function needs to be split up someday.
-  //XXXnoririty I don't want any prefs switching open by tabs to window
-  //XXXpch: this routine needs to be cleaned up.
-
-  var defaultSearchURL = null;
-  var navigatorRegionBundle = document.getElementById("bundle_browser_region");
-  var fallbackDefaultSearchURL = navigatorRegionBundle.getString("fallbackDefaultSearchURL");
-
-  //Check to see if search string contains "://" or "ftp." or white space.
-  //If it does treat as url and match for pattern
-
-  var urlmatch= /(:\/\/|^ftp\.)[^ \S]+$/
-  var forceAsURL = urlmatch.test(searchStr);
-
-  try {
-    defaultSearchURL = gPrefService.getComplexValue("browser.search.defaulturl",
-                                            Components.interfaces.nsIPrefLocalizedString).data;
-  } catch (ex) {
-  }
-
-  // Fallback to a default url (one that we can get sidebar search results for)
-  if (!defaultSearchURL)
-    defaultSearchURL = fallbackDefaultSearchURL;
-
-  if (!searchStr) {
-    BrowserSearchInternet();
-  } else {
-
-    //Check to see if location bar field is a url
-    //If it is a url go to URL.  A Url is "://" or "." as commented above
-    //Otherwise search on entry
-    if (forceAsURL) {
-       BrowserLoadURL(null, null)
-    } else {
-      if (searchStr) {
-        var escapedSearchStr = encodeURIComponent(searchStr);
-        defaultSearchURL += escapedSearchStr;
-        var searchDS = Components.classes["@mozilla.org/rdf/datasource;1?name=internetsearch"]
-                                 .getService(Components.interfaces.nsIInternetSearchService);
-
-        searchDS.RememberLastSearchText(escapedSearchStr);
-        try {
-          var searchEngineURI = gPrefService.getCharPref("browser.search.defaultengine");
-          if (searchEngineURI) {
-            var searchURL = getSearchUrl("actionButton");
-            if (searchURL) {
-              defaultSearchURL = searchURL + escapedSearchStr;
-            } else {
-              searchURL = searchDS.GetInternetSearchURL(searchEngineURI, escapedSearchStr, 0, 0, {value:0});
-              if (searchURL)
-                defaultSearchURL = searchURL;
-            }
-          }
-        } catch (ex) {
-        }
-
-        if (!newTabFlag) {
-          loadURI(defaultSearchURL, null, null);
-        }
-        else {
-          getBrowser().loadOneTab(defaultSearchURL);
-        }
+    if (window.location.href != getBrowserURL()) {
+      var win = getTopWin();
+      if (win) {
+        // If there's an open browser window, it should handle this command
+        win.focus()
+        win.BrowserSearch.webSearch();
+      } else {
+        // If there are no open browser windows, open a new one
+        win = window.openDialog("chrome://browser/content/", "_blank",
+                                "chrome,all,dialog=no", "about:blank");
+        win.addEventListener("load", BrowserSearch.WebSearch, false);
       }
+      return;
     }
+#endif
+    var searchBar = this.getSearchBar();
+    if (searchBar) {
+      searchBar.select();
+      searchBar.focus();
+    } else {
+      var ss = Cc["@mozilla.org/browser/search-service;1"].
+               getService(Ci.nsIBrowserSearchService);
+      var searchForm = ss.defaultEngine.searchForm;
+      loadURI(searchForm, null, null);
+    }
+  },
+
+  /**
+   * Loads a search results page, given a set of search terms. Uses the current
+   * engine if the search bar is visible, or the default engine otherwise.
+   *
+   * @param searchText
+   *        The search terms to use for the search.
+   *
+   * @param useNewTab
+   *        Boolean indicating whether or not the search should load in a new
+   *        tab.
+   */
+  loadSearch: function BrowserSearch_search(searchText, useNewTab) {
+    var ss = Cc["@mozilla.org/browser/search-service;1"].
+             getService(Ci.nsIBrowserSearchService);
+    var engine;
+  
+    // If the search bar is visible, use the current engine, otherwise, fall back
+    // to the default engine.
+    if (this.getSearchBar())
+      engine = ss.currentEngine;
+    else
+      engine = ss.defaultEngine;
+  
+    var submission = engine.getSubmission(searchText);
+  
+    if (useNewTab) {
+      getBrowser().loadOneTab(submission.uri.spec, null, null,
+                              submission.postData, false);
+    } else
+      loadURI(submission.uri.spec, null, submission.postData);
+  },
+  
+  /**
+   * Returns the search bar element if it is present in the toolbar and not
+   * hidden, null otherwise.
+   */
+  getSearchBar: function BrowserSearch_getSearchBar() {
+    var searchBar = document.getElementById("searchbar");
+    if (searchBar && !searchBar.parentNode.parentNode.collapsed &&
+        !(window.getComputedStyle(searchBar.parentNode, null).display == "none"))
+      return searchBar;
+    return null;
   }
 }
 
@@ -4903,24 +4858,35 @@ nsContextMenu.prototype = {
         return text;
     },
 
-    // Get selected object and convert it to a string to get
-    // selected text.   Only display the first 15 chars.
+    // Get selected text. Only display the first 15 chars.
     isTextSelection : function() {
-        var result = false;
-        var selection = this.searchSelected(16);
+      // Get 16 characters, so that we can trim the selection if it's greater
+      // than 15 chars
+      var selectedText = getBrowserSelection(16);
 
-        var searchSelectText;
-        if (selection) {
-            searchSelectText = selection.toString();
-            if (searchSelectText.length > 15)
-                searchSelectText = searchSelectText.substr(0,15) + "...";
-            result = true;
+      if (!selectedText)
+        return false;
 
-          // format "Search for <selection>" string to show in menu
-          searchSelectText = gNavigatorBundle.getFormattedString("searchText", [searchSelectText]);
-          this.setItemAttr("context-searchselect", "label", searchSelectText);
-        }
-        return result;
+      if (selectedText.length > 15)
+        selectedText = selectedText.substr(0,15) + "...";
+
+      // Use the current engine if the search bar is visible, the default
+      // engine otherwise.
+      var engineName = "";
+      var ss = Cc["@mozilla.org/browser/search-service;1"].
+               getService(Ci.nsIBrowserSearchService);
+      if (BrowserSearch.getSearchBar())
+        engineName = ss.currentEngine.name;
+      else
+        engineName = ss.defaultEngine.name;
+
+      // format "Search <engine> for <selection>" string to show in menu
+      var menuLabel = gNavigatorBundle.getFormattedString("contextMenuSearchText",
+                                                          [engineName,
+                                                           selectedText]);
+      this.setItemAttr("context-searchselect", "label", menuLabel);
+
+      return true;
     },
 
     // Returns true if anything is selected.
@@ -4928,25 +4894,6 @@ nsContextMenu.prototype = {
         return !document.commandDispatcher.focusedWindow.getSelection().isCollapsed;
     },
 
-    searchSelected : function( charlen ) {
-        var focusedWindow = document.commandDispatcher.focusedWindow;
-        var searchStr = focusedWindow.getSelection();
-        searchStr = searchStr.toString();
-        // searching for more than 150 chars makes no sense
-        if (!charlen)
-            charlen = 150;
-        if (charlen < searchStr.length) {
-            // only use the first charlen important chars. see bug 221361
-            var pattern = new RegExp("^(?:\\s*.){0," + charlen + "}");
-            pattern.test(searchStr);
-            searchStr = RegExp.lastMatch;
-        }
-        searchStr = searchStr.replace(/^\s+/, "");
-        searchStr = searchStr.replace(/\s+$/, "");
-        searchStr = searchStr.replace(/\s+/g, " ");
-        return searchStr;
-    },
-
     toString : function () {
         return "contextMenu.target     = " + this.target + "\n" +
                "contextMenu.onImage    = " + this.onImage + "\n" +
@@ -4955,6 +4902,7 @@ nsContextMenu.prototype = {
                "contextMenu.inFrame    = " + this.inFrame + "\n" +
                "contextMenu.hasBGImage = " + this.hasBGImage + "\n";
     },
+
     isTargetATextBox : function ( node )
     {
       if (node instanceof HTMLInputElement)
@@ -5001,6 +4949,41 @@ nsContextMenu.prototype = {
     }
 }
 
+/**
+ * Gets the selected text in the active browser. Leading and trailing
+ * whitespace is removed, and consecutive whitespace is replaced by a single
+ * space. A maximum of 150 characters will be returned, regardless of the value
+ * of aCharLen.
+ *
+ * @param aCharLen
+ *        The maximum number of characters to return.
+ */
+function getBrowserSelection(aCharLen) {
+  // selections of more than 150 characters aren't useful
+  const kMaxSelectionLen = 150;
+  const charLen = Math.min(aCharLen || kMaxSelectionLen, kMaxSelectionLen);
+
+  var focusedWindow = document.commandDispatcher.focusedWindow;
+  var selection = focusedWindow.getSelection().toString();
+
+  if (selection) {
+    if (selection.length > charLen) {
+      // only use the first charLen important chars. see bug 221361
+      var pattern = new RegExp("^(?:\\s*.){0," + charLen + "}");
+      pattern.test(selection);
+      selection = RegExp.lastMatch;
+    }
+
+    selection = selection.replace(/^\s+/, "")
+                         .replace(/\s+$/, "")
+                         .replace(/\s+/g, " ");
+
+    if (selection.length > charLen)
+      selection = selection.substr(0, charLen);
+  }
+  return selection;
+}
+
 var gWebPanelURI;
 function openWebPanel(aTitle, aURI)
 {
@@ -6557,3 +6540,4 @@ var BookmarksEventHandler = {
 #include ../../../toolkit/content/debug.js
 
 #endif
+
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 57ade544379..a9628a67423 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -301,7 +301,7 @@
                onpopuphidden="BookmarksToolbar.unsetOpenedMenu(event);">
           <hbox id="bookmarks-ptf" class="bookmarks-toolbar-items" contextmenu="bookmarks-context-menu"
                 flex="1" style="min-width:0px; width:0px;padding-left: 3px;" 
-                datasources="rdf:bookmarks rdf:files rdf:localsearch"
+                datasources="rdf:bookmarks rdf:files"
                 template="bookmarks-template" flags="dont-test-empty"
                 infer="forward-proxy"
                 rdf:type="http://home.netscape.com/NC-rdf#Folder"
@@ -320,7 +320,7 @@
               <toolbarbutton id="bookmarks-chevron" type="menu" class="chevron"
                              chromedir="&locale.dir;"
                              mousethrough="never" collapsed="true" 
-                             datasources="rdf:bookmarks rdf:files rdf:localsearch"
+                             datasources="rdf:bookmarks rdf:files"
                              template="bookmarks-template" flags="dont-test-empty"
                              onpopupshowing="BookmarksMenu.onShowMenu(event.target)"
                              onpopuphidden="BookmarksMenu.onHideMenu(event.target)"
diff --git a/browser/base/content/search.xml b/browser/base/content/search.xml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/base/content/searchDialog.css b/browser/base/content/searchDialog.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/base/content/searchDialog.js b/browser/base/content/searchDialog.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/base/content/searchDialog.xul b/browser/base/content/searchDialog.xul
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/base/content/searchbarBindings.css b/browser/base/content/searchbarBindings.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 86559c5bc41..6a43bca4047 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -31,11 +31,6 @@ browser.jar:
 *       content/browser/safeMode.xul                  (content/safeMode.xul)
 *       content/browser/sanitize.js                   (content/sanitize.js)
 *       content/browser/sanitize.xul                  (content/sanitize.xul)
-*       content/browser/search.xml                    (content/search.xml)
-*       content/browser/searchDialog.js               (content/searchDialog.js)
-*       content/browser/searchDialog.xul              (content/searchDialog.xul)
-*       content/browser/searchDialog.css              (content/searchDialog.css)
-        content/browser/searchbarBindings.css         (content/searchbarBindings.css)
 *       content/browser/utilityOverlay.js             (content/utilityOverlay.js)
 *       content/browser/web-panels.js                 (content/web-panels.js)
 *       content/browser/web-panels.xul                (content/web-panels.xul)
diff --git a/browser/components/Makefile.in b/browser/components/Makefile.in
index c77b22dc744..fa6972efb67 100644
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -59,6 +59,7 @@ DIRS = \
 	dirprovider \
 	migration \
 	preferences \
+	search \
 	shell \
 	sidebar \
 	$(NULL)
diff --git a/browser/components/bookmarks/content/bookmarksTree.xml b/browser/components/bookmarks/content/bookmarksTree.xml
index 436c1532d62..476f70cf17f 100644
--- a/browser/components/bookmarks/content/bookmarksTree.xml
+++ b/browser/components/bookmarks/content/bookmarksTree.xml
@@ -849,7 +849,7 @@
                  onkeypress="event.preventBubble();"/>
       <vbox flex="1">
         <tree anonid="bookmarks-tree" flex="1" class="plain" enableColumnDrag="true"
-                  datasources="rdf:bookmarks rdf:files rdf:localsearch" ref="NC:BookmarksTopRoot" flags="dont-build-content"
+                  datasources="rdf:bookmarks rdf:files" ref="NC:BookmarksTopRoot" flags="dont-build-content"
                   onkeypress="if (event.keyCode == 13) this.parentNode.parentNode.openItemKey();"
                   onclick="this.parentNode.parentNode.openItemClick(event, 1);"
                   ondblclick="this.parentNode.parentNode.openItemClick(event, 2);"
@@ -945,7 +945,7 @@
                  onclick="event.preventBubble();"
                  onkeypress="event.preventBubble();"/>
       <tree anonid="bookmarks-tree" flex="1" class="plain" hidecolumnpicker="true"
-                datasources="rdf:bookmarks rdf:files rdf:localsearch" ref="NC:BookmarksRoot" flags="dont-build-content"
+                datasources="rdf:bookmarks rdf:files" ref="NC:BookmarksRoot" flags="dont-build-content"
                 onselect="this.parentNode.treeBoxObject.view.selectionChanged();" seltype="single">
         <template xmlns:nc="http://home.netscape.com/NC-rdf#">
           <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
@@ -985,7 +985,7 @@
     <xbl:content xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xbl="http://www.mozilla.org/xbl">
       <tree anonid="bookmarks-tree" class="bookmarksTree" flex="1" hidecolumnpicker="true"
             xbl:inherits="rows,seltype"
-            datasources="rdf:bookmarks rdf:files rdf:localsearch" ref="NC:BookmarksTopRoot" flags="dont-build-content"
+            datasources="rdf:bookmarks rdf:files" ref="NC:BookmarksTopRoot" flags="dont-build-content"
             onselect="this.parentNode.treeBoxObject.view.selectionChanged();">
         <template>
           <!-- I don't want these things to appear at all, but that's not an option -->
diff --git a/browser/components/search/Makefile.in b/browser/components/search/Makefile.in
new file mode 100644
index 00000000000..d35ecfa96fd
--- /dev/null
+++ b/browser/components/search/Makefile.in
@@ -0,0 +1,53 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Browser Search Service.
+#
+# The Initial Developer of the Original Code is
+# Google Inc.
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Ben Goodger <beng@google.com> (Original author)
+#   Gavin Sharp <gavin@gavinsharp.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** */
+
+DEPTH     = ../../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = browsersearch
+XPIDL_MODULE = browsersearch
+
+XPIDLSRCS = nsIBrowserSearchService.idl
+
+EXTRA_PP_COMPONENTS = nsSearchService.js
+
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml
index fa67c8ae836..0905a0d1b9b 100644
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-
 # -*- Mode: HTML -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -22,8 +21,9 @@
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
-#   Pierre Chanial V 2.0 (p_ch@verizon.net)
-#   Gavin Sharp (gavin@gavinsharp.com)
+#   Pierre Chanial (v2) <p_ch@verizon.net>
+#   Gavin Sharp (v3) <gavin@gavinsharp.com>
+#   Ben Goodger <beng@google.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -40,64 +40,243 @@
 # ***** END LICENSE BLOCK *****
 
 <bindings id="SearchBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-          xmlns:xbl="http://www.mozilla.org/xbl">
+      xmlns="http://www.mozilla.org/xbl"
+      xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      xmlns:xbl="http://www.mozilla.org/xbl">
 
   <binding id="searchbar-base">
     <resources>
-      <stylesheet src="chrome://browser/content/searchbarBindings.css"/>
+      <stylesheet src="chrome://browser/content/search/searchbarBindings.css"/>
       <stylesheet src="chrome://browser/skin/searchbar.css"/>
     </resources>
   </binding>
 
-  <binding id="searchbar" extends="chrome://browser/content/search.xml#searchbar-base">
+  <binding id="searchbar"
+           extends="chrome://browser/content/search/search.xml#searchbar-base">
     <content>
-      <xul:stringbundle src="chrome://browser/locale/searchbar.properties"/>
-      <xul:textbox class="searchbar-textbox" type="autocomplete" flex="1"
+      <xul:stringbundle src="chrome://browser/locale/search.properties"/>
+      <xul:textbox class="searchbar-textbox"
+                   type="autocomplete"
+                   flex="1"
                    autocompletepopup="PopupAutoComplete"
                    autocompletesearch="form-history"
                    autocompletesearchparam="searchbar-history"
                    completeselectedindex="true"
                    tabscrolling="true"
                    xbl:inherits="disableautocomplete,searchengine,src">
-        <xul:button class="searchbar-dropmarker" type="menu"
-                    id="searchbar-dropmarker" popup="_child" xbl:inherits="src">
-          <xul:menupopup anonid="searchbar-popup" position="after_start"
-                         datasources="rdf:internetsearch"
-                         ref="NC:SearchEngineRoot" 
-                         oncommand="this.parentNode.parentNode.onEnginePopupCommand(event);"
-                         onpopupshowing="this.parentNode.parentNode.onEnginePopupShowing(event);"
-                         onpopuphidden="this.parentNode.parentNode.onEnginePopupHidden(event);">
-            <xul:template>
-              <xul:menuitem type="checkbox"
-                            uri="rdf:*" value="rdf:*"
-                            src="rdf:http://home.netscape.com/NC-rdf#Icon"
-                            label="rdf:http://home.netscape.com/NC-rdf#Name"/>
-            </xul:template>
-          </xul:menupopup>
+        <xul:button class="searchbar-dropmarker"
+                    type="menu"
+                    anonid="searchbar-dropmarker"
+                    popup="_child"
+                    xbl:inherits="src">
+          <xul:menupopup anonid="searchbar-popup"
+                         class="searchbar-popup"
+                         position="after_start"
+                         oncommand="this.parentNode.parentNode
+                                        .parentNode
+                                        .onEnginePopupCommand(event);"/>
         </xul:button>
       </xul:textbox>
     </content>
-    <implementation>
-      <field name="mStringBundle"> document.getAnonymousNodes(this)[0] </field>
-      <field name="mTextbox"> document.getAnonymousNodes(this)[1] </field>
+    <implementation implements="nsIObserver">
+
+      <constructor><![CDATA[
+        // Refresh the display (updating icon, etc)
+        this.updateDisplay();
+        this.populatePopup();
+
+        var os =
+               Components.classes["@mozilla.org/observer-service;1"]
+                         .getService(Components.interfaces.nsIObserverService);
+        os.addObserver(this, "browser-search-engine-modified", false);
+      ]]></constructor>
+
+      <destructor><![CDATA[
+        var os = Components.classes["@mozilla.org/observer-service;1"]
+                   .getService(Components.interfaces.nsIObserverService);
+        os.removeObserver(this, "browser-search-engine-modified");
+      ]]></destructor>
+
+      <field name="_stringBundle">document.getAnonymousNodes(this)[0];</field>
+      <field name="_textbox">document.getAnonymousNodes(this)[1];</field>
+      <field name="_popup">
+        document.getAnonymousElementByAttribute(this,
+                                                "anonid",
+                                                "searchbar-popup");
+      </field>
+      <field name="_ss">null</field>
+
+      <property name="currentEngine" onset="this.searchService.currentEngine = val;"
+                                     onget="return this.searchService.currentEngine;"/>
+
+      <property name="searchService" readonly="true">
+        <getter><![CDATA[
+          if (!this._ss) {
+            const nsIBSS = Components.interfaces.nsIBrowserSearchService;
+            this._ss =
+                 Components.classes["@mozilla.org/browser/search-service;1"]
+                           .getService(nsIBSS);
+          }
+          return this._ss;
+        ]]></getter>
+      </property>
+
+      <property name="value"
+                onget="return this._textbox.value;"
+                onset="this._textbox.value = val; return val;"/>
+
       <method name="focus">
         <body><![CDATA[
-          this.mTextbox.focus();
+          this._textbox.focus();
         ]]></body>
       </method>
+
       <method name="select">
         <body><![CDATA[
-          this.mTextbox.select();
+          this._textbox.select();
         ]]></body>
       </method>
+
+      <method name="observe">
+        <parameter name="aEngine"/>
+        <parameter name="aTopic"/>
+        <parameter name="aVerb"/>
+        <body><![CDATA[
+          switch (aVerb) {
+            case "engine-removed":
+            case "engine-added":
+            case "engine-changed":
+              // An engine was removed (or hidden), added, or an icon was
+              // changed
+              this.populatePopup();
+              // Fall through
+            case "engine-current":
+              // The current engine was changed
+              this.updateDisplay();
+          }
+        ]]></body>
+      </method>
+
+      <method name="updateDisplay">
+        <body><![CDATA[
+          var uri = this.currentEngine.iconURI;
+          if (uri)
+            this.setAttribute("src", uri.spec);
+
+          var name = this.currentEngine.name;
+          var text = this._stringBundle.getFormattedString("searchtip", [name]);
+          this.setAttribute("tooltiptext", text);
+        ]]></body>
+      </method>
+
+      <method name="populatePopup">
+        <body><![CDATA[
+          var popup = this._popup;
+
+          // Clear the popup
+          while (popup.firstChild)
+            popup.removeChild(popup.firstChild);
+
+          var engines = this.searchService.getVisibleEngines({ });
+          const kXULNS =
+               "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+          for (var i = 0; i < engines.length; ++i) {
+            var menuitem = document.createElementNS(kXULNS, "menuitem");
+            menuitem.setAttribute("label", engines[i].name);
+            menuitem.setAttribute("id", engines[i].name);
+            menuitem.setAttribute("class", "menuitem-iconic");
+            if (engines[i].iconURI)
+              menuitem.setAttribute("src", engines[i].iconURI.spec);
+            popup.appendChild(menuitem);
+            menuitem.engine = engines[i];
+          }
+
+          // Add the "Get more engines" item
+          // XXX this will become "edit this list"
+          var separator = document.createElementNS(kXULNS, "menuseparator");
+          popup.appendChild(separator);
+
+          menuitem = document.createElementNS(kXULNS, "menuitem");
+          /* XXX
+          const label = this._stringBundle.getString("cmd_editList");
+          const accesskey = this._stringBundle.getString("cmd_editListAccesskey");
+          */
+          const label = this._stringBundle.getString("cmd_addEngine");
+          const accesskey = this._stringBundle.getString("cmd_addEngine_accesskey");
+          menuitem.setAttribute("label", label);
+          menuitem.setAttribute("accesskey", accesskey);
+          menuitem.setAttribute("id", "editlist");
+          popup.appendChild(menuitem);
+        ]]></body>
+      </method>
+
+      <method name="onEnginePopupCommand">
+        <parameter name="aEvent"/>
+        <body><![CDATA[
+          if (aEvent.target.id == "editlist") {
+            // XXX
+            /* openDialog("chrome://browser/content/search/edit-engines.xul", "",
+                       "modal,centerscreen"); */
+            var regionBundle = document.getElementById("bundle_browser_region");
+            loadURI(regionBundle.getString("searchEnginesURL"), null, null);
+          } else {
+            this.currentEngine = aEvent.target.engine;
+            this.focus();
+            this.select();
+          }
+        ]]></body>
+      </method>
+
+      <method name="selectEngine">
+        <parameter name="aEvent"/>
+        <parameter name="isNextEngine"/>
+        <body><![CDATA[
+          // XXX this seems suboptimal...
+          var currentEngine = this.currentEngine;
+          if (currentEngine) {
+            var engines = this.searchService.getVisibleEngines({ });
+            for (var i = 0; i < engines.length; ++i) {
+              if (engines[i] == currentEngine) {
+                var nextIndex = i + (isNextEngine ? 1 : -1);
+                if (nextIndex >= 0 && nextIndex < engines.length)
+                  this.currentEngine = engines[nextIndex];
+                break;
+              }
+            }
+          }
+          aEvent.preventDefault();
+          aEvent.stopPropagation();
+        ]]></body>
+      </method>
+
+      <method name="doSearch">
+        <parameter name="aData"/>
+        <parameter name="aInNewTab"/>
+        <body><![CDATA[
+          var postData = { value: null };
+          var submission = this.currentEngine.getSubmission(aData);
+          if (submission) {
+            url = submission.uri.spec;
+            postData.value = submission.postData;
+          }
+
+          if (aInNewTab) {
+            content.focus();
+            getBrowser().loadOneTab(url, null, null, postData.value, false);
+            if (gURLBar)
+              gURLBar.value = url;
+          } else
+            loadURI(url, null, postData.value);
+          content.focus();
+        ]]></body>
+      </method>
+
     </implementation>
   </binding>
 
-  <binding id="searchbar-textbox" extends="chrome://global/content/bindings/autocomplete.xml#autocomplete">
+  <binding id="searchbar-textbox"
+      extends="chrome://global/content/bindings/autocomplete.xml#autocomplete">
     <implementation>
-
       <constructor><![CDATA[
         if (this.parentNode.parentNode.parentNode.localName ==
             "toolbarpaletteitem")
@@ -113,82 +292,49 @@
         } catch (ex) { }
       ]]></destructor>
 
-      <property name="mContextMenu" readonly="true">
-        <getter>
-          var textBox = document.getAnonymousElementByAttribute(this, 
-                        "anonid", "textbox-input-box");
-          return document.getAnonymousElementByAttribute(textBox, 
-                        "anonid", "input-box-contextmenu");
-        </getter>
-      </property>
+      <field name="_stringBundle">this.parentNode._stringBundle</field>
+      <field name="_formHistSvc"/>
+      <field name="_prefBranch"/>
 
       <method name="initialize">
         <body><![CDATA[
-          this.rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"]
-                               .getService(Components.interfaces.nsIRDFService);
-          this.internetSearchDS = this.rdfService.GetDataSource("rdf:internetsearch");
-          this.formHistSvc = Components
-                              .classes["@mozilla.org/satchel/form-history;1"]
-                              .getService(Components.interfaces.nsIFormHistory);
-
-          this.prefService = 
+          this._formHistSvc =
+                   Components.classes["@mozilla.org/satchel/form-history;1"]
+                             .getService(Components.interfaces.nsIFormHistory);
+          this._prefBranch =
                     Components.classes["@mozilla.org/preferences-service;1"]
-                              .getService(Components.interfaces.nsIPrefBranch2);
+                              .getService(Components.interfaces.nsIPrefBranch);
 
-          if (this.prefService.getBoolPref("browser.urlbar.clickSelectsAll"))
+          if (this._prefBranch.getBoolPref("browser.urlbar.clickSelectsAll"))
             this.setAttribute("clickSelectsAll", true);
 
-          this._initializeEngine();
+          var textBox = document.getAnonymousElementByAttribute(this,
+                                                "anonid", "textbox-input-box");
+          var cxmenu = document.getAnonymousElementByAttribute(textBox,
+                                            "anonid", "input-box-contextmenu");
 
-          var element;
-          element = document.createElementNS(XUL_NS, "menuseparator");
-          this.mContextMenu.appendChild(element);
+          var element = document.createElementNS(XUL_NS, "menuseparator");
+          cxmenu.appendChild(element);
           element = document.createElementNS(XUL_NS, "menuitem");
-          element.setAttribute("label", this.mStringBundle
-                               .getString("cmd_clearHistory"));
-          element.setAttribute("accesskey", this.mStringBundle
-                               .getString("cmd_clearHistory_accesskey"));
+          const label = this._stringBundle.getString("cmd_clearHistory");
+          const akey = this._stringBundle.getString("cmd_clearHistory_accesskey");
+          element.setAttribute("label", label);
+          element.setAttribute("accesskey", akey);
           element.setAttribute("cmd", "cmd_clearhistory");
-          this.mContextMenu.appendChild(element);
+
+          cxmenu.appendChild(element);
+
           this.controllers.appendController(this.searchbarController);
-
         ]]></body>
       </method>
 
-      <method name="_initializeEngine">
-        <body><![CDATA[
-          var selectedEngineName;
-          try {
-            selectedEngineName = 
-                    this.prefService
-                        .getComplexValue("browser.search.selectedEngine",
-                                         this.nsIPrefLocalizedString).data;
-          } catch (ex) { }
-
-          // try to set the engine by name
-          this.currentEngineName = selectedEngineName;
-
-          // check to see whether it failed
-          var engine = this.currentEngine;
-          if (!engine)
-            this.currentEngine = this.getDefaultEngine();
-        ]]></body>
-      </method>
-
-      <field name="nsIPrefLocalizedString">
-        Components.interfaces.nsIPrefLocalizedString;
-      </field>
-      <field name="mStringBundle"> this.parentNode.mStringBundle </field>
-      <field name="rdfService"/>
-      <field name="internetSearchDS"/>
-      <field name="formHistSvc"/>
-
       <method name="openSearch">
         <body>
           <![CDATA[
-            if (!this.popupOpen) {  // Don't open search popup if history popup is open
+            // Don't open search popup if history popup is open
+            if (!this.popupOpen) {
               document.getAnonymousElementByAttribute(this.parentNode,
-                                                      "id", "searchbar-dropmarker").click();
+                                         "anonid", "searchbar-dropmarker").click();
               return false;
             }
             return true;
@@ -196,217 +342,44 @@
         </body>
       </method>
 
-      <property name="currentEngine"
-                onget="return this.parentNode.getAttribute('searchengine');">
-        <setter><![CDATA[
-
-          if (!val) {
-            if (this.parentNode)
-              this.parentNode.removeAttribute("searchengine");
-            return;
-          }
-
-          this.parentNode.setAttribute("searchengine", val);
-          const kNC_Icon = this.rdfService.GetResource("http://home.netscape.com/NC-rdf#Icon");
-          var rEngine = this.rdfService.GetResource(val);
-
-          this.parentNode.setAttribute("src", this.readRDFString(rEngine, kNC_Icon));
-          
-          const kNC_Name = this.rdfService.GetResource("http://home.netscape.com/NC-rdf#Name");
-          var pls = Components.classes["@mozilla.org/pref-localizedstring;1"]
-                              .createInstance(this.nsIPrefLocalizedString);
-          pls.data = this.readRDFString(rEngine, kNC_Name);
-
-          this.prefService.setComplexValue("browser.search.selectedEngine",
-                                           this.nsIPrefLocalizedString, pls);
-
-          var toolTipText = this.mStringBundle
-                                .getFormattedString("searchtip", [pls]);
-          this.parentNode.setAttribute("tooltiptext", toolTipText);
-        ]]></setter>
-      </property>
-
-      <property name="currentEngineName"
-                onget="return this.parentNode.getAttribute('searchenginename');"
-                onset="this.setEngineByName(val);"/>
-
-      <method name="setEngineByName">
-        <parameter name="aName"/>
-        <body><![CDATA[
-          // XXX this shouldn't be necessary, but it avoids errors
-          // because the searchbar isn't currently destroyed when
-          // removed from the toolbar
-          if (!this.parentNode) {
-            return false;
-          }
-
-          const kNC_Root  = this.rdfService.GetResource("NC:SearchEngineRoot");
-          const kNC_Child = this.rdfService.GetResource("http://home.netscape.com/NC-rdf#child");
-          const kNC_Name  = this.rdfService.GetResource("http://home.netscape.com/NC-rdf#Name");
-
-          var arcs = this.internetSearchDS.GetTargets(kNC_Root, kNC_Child, true);
-          while (arcs.hasMoreElements()) {
-            var rEngine = arcs.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
-            var name = this.readRDFString(rEngine, kNC_Name);
-            if (name == aName) {
-              this.currentEngine = rEngine.Value;
-              this.parentNode.setAttribute('searchenginename', name);
-              return true;
-            }
-          }
-          this.currentEngine = null;
-          this.parentNode.removeAttribute('searchenginename')
-          return false;
-        ]]></body>
-      </method>
-
-      <method name="getDefaultEngine">
-        <body><![CDATA[
-          var defaultName = this.prefService
-                                .getComplexValue("browser.search.defaultenginename",
-                                                 this.nsIPrefLocalizedString).data;
-
-          const kNC_Root  = this.rdfService.GetResource("NC:SearchEngineRoot");
-          const kNC_child = this.rdfService.GetResource("http://home.netscape.com/NC-rdf#child");
-          const kNC_Name  = this.rdfService.GetResource("http://home.netscape.com/NC-rdf#Name");
-          
-          var arcs = this.internetSearchDS.GetTargets(kNC_Root, kNC_child, true);
-          while (arcs.hasMoreElements()) {
-            var rEngine = arcs.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
-            var name = this.readRDFString(rEngine, kNC_Name);
-            if (name == defaultName)
-              return rEngine.Value;
-          }
-          return null;
-        ]]></body>
-      </method>
-
-      <method name="readRDFString">
-        <parameter name="aRes"/>
-        <parameter name="aProp"/>
-        <body><![CDATA[
-          var n = this.internetSearchDS.GetTarget(aRes, aProp, true);
-          return n ? n.QueryInterface(Components.interfaces.nsIRDFLiteral).Value : null;
-        ]]></body>
-      </method>
-
-      // overload |onTextEntered| in autocomplete.xml
+      <!-- overload |onTextEntered| in autocomplete.xml -->
       <method name="onTextEntered">
         <parameter name="aEvent"/>
         <body><![CDATA[
           // Save the current value in the form history
           if (this.value && !this.hasAttribute("disableautocomplete"))
-            this.formHistSvc.addEntry(this.getAttribute(
+            this._formHistSvc.addEntry(this.getAttribute(
                                       "autocompletesearchparam"), this.value);
-
-          var ISEARCHSVC = Components.classes["@mozilla.org/rdf/datasource;1?name=internetsearch"]
-                                     .getService(Components.interfaces.nsIInternetSearchService);
-          //XXX Bug 269994: Add in dummy search text "ABC" if the field is empty to ensure a result
-          var searchURL = ISEARCHSVC.GetInternetSearchURL(this.currentEngine,
-                                       this.value? encodeURIComponent(this.value):"ABC", 
-                                       0, 0, {value:0});
-
-          // if the search box is empty, let's load the host
-          if (!this.value) {
-            var uri = Components.classes["@mozilla.org/network/io-service;1"]
-                                .getService(Components.interfaces.nsIIOService)
-                                .newURI(searchURL, null, null);
-
-            try {
-              searchURL = uri.host;
-            } catch (ex) {}
-          }
           var evt = aEvent || this.mEnterEvent;
-          var openInTab = this.prefService.getBoolPref("browser.search.openintab");
-          SearchLoadURL(searchURL, ((evt && evt.altKey) ^ openInTab));
-        ]]></body>
-      </method>
-
-      <method name="onEnginePopupCommand">
-        <parameter name="aEvent"/>
-        <body><![CDATA[
-          var target = aEvent.target
-          if (target.getAttribute("anonid") == "addengine-menuitem") {
-            var regionBundle = document.getElementById("bundle_browser_region");
-            loadURI(regionBundle.getString("searchEnginesURL"), null, null);
-          } else {
-            this.currentEngine = target.id;
-            this.focus();
-            this.select();
-          }
-        ]]></body>
-      </method>
-
-      <method name="onEnginePopupShowing">
-        <parameter name="aEvent"/>
-        <body><![CDATA[
-          var target = aEvent.target;
-          var element = document.getAnonymousElementByAttribute(this.parentNode,
-                           "anonid", "addengine-menuitem");
-          if (element)
-            return;
-
-          element = document.createElementNS(XUL_NS, "menuseparator");
-          target.appendChild(element);
-          element = document.createElementNS(XUL_NS, "menuitem");
-          element.setAttribute("label", this.mStringBundle
-              .getString("cmd_addEngine"));
-          element.setAttribute("accesskey", this.mStringBundle
-              .getString("cmd_addEngine_accesskey"));
-          element.setAttribute("anonid", "addengine-menuitem");
-          target.appendChild(element);
-        ]]></body>
-      </method>
-
-      <method name="onEnginePopupHidden">
-        <parameter name="aEvent"/>
-        <body><![CDATA[
-          var target = aEvent.target;
-          var element = document.getAnonymousElementByAttribute(this.parentNode,
-                           "anonid", "addengine-menuitem");
-          if (element) {
-            target.removeChild(target.lastChild);
-            target.removeChild(target.lastChild);
-          }
+          var newTab = this._prefBranch.getBoolPref("browser.search.openintab");
+          this.parentNode.doSearch(this.value, ((evt && evt.altKey) ^ newTab));
         ]]></body>
       </method>
 
       <!-- nsIController -->
-      <field name="searchbarController" readonly="true"><![CDATA[
-      ({
-        mOuter: this,
-        
-        supportsCommand: function (aCommand)
-        {
+      <field name="searchbarController" readonly="true"><![CDATA[({
+        _self: this,
+        supportsCommand: function(aCommand) {
           return aCommand == "cmd_clearhistory";
         },
-        
-        isCommandEnabled: function (aCommand)
-        {
-          return this.mOuter.formHistSvc.nameExists(
-                 this.mOuter.getAttribute("autocompletesearchparam"));
+
+        isCommandEnabled: function(aCommand) {
+          return this._self._formHistSvc.nameExists(
+                 this._self.getAttribute("autocompletesearchparam"));
         },
 
-        doCommand: function (aCommand)
-        {
-          // Clear the searchbar and its undo history
-          this.mOuter.value = "";
-          this.mOuter.editor.enableUndo(false);
-          this.mOuter.editor.enableUndo(true);
-
-          this.mOuter.formHistSvc.removeEntriesForName(
-              this.mOuter.getAttribute("autocompletesearchparam"));
+        doCommand: function (aCommand) {
+          this._self._formHistSvc.removeEntriesForName(
+              this._self.getAttribute("autocompletesearchparam"));
+          this._self.value = "";
         }
-      })
-      ]]></field>
+      })]]></field>
 
       <!-- DND Observer -->
-      <field name="searchbarDNDObserver" readonly="true"><![CDATA[
-      ({
+      <field name="searchbarDNDObserver" readonly="true"><![CDATA[({
         mOuter: this,
-
-        onDrop: function (aEvent, aXferData, aDragSession)
-        {
+      
+        onDrop: function (aEvent, aXferData, aDragSession) {
           var data = transferUtils.retrieveURLFromData(aXferData.data, 
                          aXferData.flavour.contentType);
           if (data) {
@@ -414,82 +387,59 @@
             this.mOuter.onTextEntered(aEvent);
           }
         },
-
-        getSupportedFlavours: function ()
-        {
+      
+        getSupportedFlavours: function () {
           var flavourSet = new FlavourSet();
-
+      
           flavourSet.appendFlavour("text/unicode");
           flavourSet.appendFlavour("text/x-moz-url");
           flavourSet.appendFlavour("application/x-moz-file", "nsIFile");     
           return flavourSet;
         }
-      })
-      ]]></field>
-
+      })]]></field>
     </implementation>
 
     <handlers>
+      <handler event="keypress" keycode="vk_up" modifiers="accel"
+               phase="capturing"
+               action="this.parentNode.selectEngine(event, false);"/>
 
-      <handler event="keypress" keycode="vk_up" modifiers="accel" phase="capturing">
-        <![CDATA[
-          var currentEngine = this.currentEngine;
-          if (currentEngine) {
-            var searchEngineMenuitem = document.getAnonymousElementByAttribute(this.parentNode, "id", currentEngine);
-            var newEngine = searchEngineMenuitem.previousSibling;
-            if (newEngine && newEngine.localName == "menuitem")
-              this.currentEngine = newEngine.id;
-          }
-          event.preventDefault();
-          event.stopPropagation();
-        ]]>
-      </handler>
-      
-      <handler event="keypress" keycode="vk_down" modifiers="alt" phase="capturing"
+      <handler event="keypress" keycode="vk_down" modifiers="accel"
+               phase="capturing"
+               action="this.parentNode.selectEngine(event, true);"/>
+
+      <handler event="keypress" keycode="vk_down" modifiers="alt"
+               phase="capturing"
                action="return this.openSearch();"/>
-      
-      <handler event="keypress" keycode="vk_up" modifiers="alt" phase="capturing"
+
+      <handler event="keypress" keycode="vk_up" modifiers="alt"
+               phase="capturing"
                action="return this.openSearch();"/>
 
 #ifndef XP_MACOSX
-      <handler event="keypress" keycode="vk_f4" phase="capturing"
+      <handler event="keypress" keycode="vk_f4"
+               phase="capturing"
                action="return this.openSearch();"/>
 #endif
 
-      <handler event="keypress" keycode="vk_down" modifiers="accel" phase="capturing">
-        <![CDATA[
-          var currentEngine = this.currentEngine;
-          if (currentEngine) {
-            var searchEngineMenuitem = document.getAnonymousElementByAttribute(this.parentNode, "id", currentEngine);
-
-            var newEngine = searchEngineMenuitem.nextSibling;
-          
-            if (newEngine && newEngine.localName == "menuitem")
-              this.currentEngine = newEngine.id;
-          }
-          event.preventDefault();
-          event.stopPropagation();
-        ]]>
-      </handler>
-
       <handler event="dragdrop" phase="capturing">
         nsDragAndDrop.drop(event, this.searchbarDNDObserver);
       </handler>
 
     </handlers>
-
   </binding>
-  
-  <binding id="searchbar-dropmarker" extends="chrome://browser/content/search.xml#searchbar-base">
+
+  <binding id="searchbar-dropmarker"
+           extends="chrome://browser/content/search/search.xml#searchbar-base">
     <content>
       <xul:stack flex="1">
-        <xul:hbox align="center">
+        <xul:hbox align="center" class="searchbar-engine-image-container">
           <xul:image class="searchbar-engine-image" xbl:inherits="src"/>
         </xul:hbox>
         <xul:image class="searchbar-dropmarker-image"/>
       </xul:stack>
       <children/>
-    </content>  
+    </content>
   </binding>
 
 </bindings>
diff --git a/browser/components/search/content/searchDialog.css b/browser/components/search/content/searchDialog.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/components/search/content/searchDialog.js b/browser/components/search/content/searchDialog.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/components/search/content/searchDialog.xul b/browser/components/search/content/searchDialog.xul
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/components/search/content/searchbarBindings.css b/browser/components/search/content/searchbarBindings.css
index e0d28a59dfb..a896151f0e9 100644
--- a/browser/components/search/content/searchbarBindings.css
+++ b/browser/components/search/content/searchbarBindings.css
@@ -1,11 +1,10 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 .searchbar-textbox {
-  -moz-binding: url("chrome://browser/content/search.xml#searchbar-textbox");
+  -moz-binding: url("chrome://browser/content/search/search.xml#searchbar-textbox");
 }
 
 .searchbar-dropmarker {
-  -moz-binding: url("chrome://browser/content/search.xml#searchbar-dropmarker");
+  -moz-binding: url("chrome://browser/content/search/search.xml#searchbar-dropmarker");
   -moz-user-focus: none;
 }
-
diff --git a/browser/components/search/jar.mn b/browser/components/search/jar.mn
new file mode 100755
index 00000000000..97c7830ae6c
--- /dev/null
+++ b/browser/components/search/jar.mn
@@ -0,0 +1,3 @@
+browser.jar:
+*       content/browser/search/search.xml                           (content/search.xml)
+        content/browser/search/searchbarBindings.css                (content/searchbarBindings.css)
diff --git a/browser/components/search/nsIBrowserSearchService.idl b/browser/components/search/nsIBrowserSearchService.idl
new file mode 100755
index 00000000000..9031bdd2e8a
--- /dev/null
+++ b/browser/components/search/nsIBrowserSearchService.idl
@@ -0,0 +1,288 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Browser Search Service.
+#
+# The Initial Developer of the Original Code is
+# Google Inc.
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Ben Goodger <beng@google.com> (Original author)
+#   Gavin Sharp <gavin@gavinsharp.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+#include "nsISupports.idl"
+
+interface nsIURI;
+interface nsIInputStream;
+
+[scriptable, uuid(1163b8bf-3446-4a36-a4df-9e870125b076)]
+interface nsISearchSubmission : nsISupports
+{
+  /**
+   * The POST data associated with a search submission, wrapped in a MIME
+   * input stream. May be null.
+   */
+  readonly attribute nsIInputStream postData;
+
+  /**
+   * The URI to submit a search to.
+   */
+  readonly attribute nsIURI uri;
+};
+
+[scriptable, uuid(b64edb5b-4d05-44df-b9bf-2098d9069f88)]
+interface nsISearchEngine : nsISupports
+{
+  /**
+   * Gets a nsISearchSubmission object that contains information about what to
+   * send to the search engine, including the URI and postData, if applicable.
+   *
+   * @param  data
+   *         Data to add to the submission object.
+   *         i.e. the search terms.
+   *
+   * @returns A nsISearchSubmission object that contains information about what
+   *          to send to the search engine.
+   */
+  nsISearchSubmission getSubmission(in AString data);
+
+  /**
+   * Adds a parameter to the search engine's submission data. This should only
+   * be called on engine's created via addEngineWithDetails.
+   *
+   * @param name
+   *        The parameter's name. Must not be null.
+   *
+   * @param value
+   *        The value to pass. If value is "{searchTerms}", it will be
+   *        substituted with the user-entered data when retrieving the
+   *        submission. Must not be null.
+   *
+   * @throws NS_ERROR_FAILURE if the search engine is read-only.
+   * @throws NS_ERROR_INVALID_ARG if name or value are null.
+   */
+  void addParam(in AString name, in AString value);
+
+  /**
+   * Supported search engine types.
+   */
+  const unsigned long TYPE_MOZSEARCH     = 1;
+  const unsigned long TYPE_SHERLOCK      = 2;
+  const unsigned long TYPE_OPENSEARCH    = 3;
+
+  /**
+   * Supported search engine data types.
+   */
+  const unsigned long DATA_XML     = 1;
+  const unsigned long DATA_TEXT    = 2;
+
+  /**
+   * The shortcut alias of the engine. This is a unique identifier.
+   */
+  attribute AString alias;
+
+  /**
+   * Whether the engine should be hidden from the user.
+   */
+  attribute boolean hidden;
+
+  /**
+   * A nsIURI corresponding to the engine's icon, stored locally. May be null.
+   */
+  readonly attribute nsIURI iconURI;
+
+  /**
+   * The display name of the search engine. This is a unique identifier.
+   */
+  readonly attribute AString name;
+
+  /**
+   * The search engine type.
+   */
+  readonly attribute long type;
+
+  /**
+   * A URL string pointing to the engine's search form.
+   */
+  readonly attribute AString searchForm;
+
+};
+
+[scriptable, uuid(eaa8c60f-a0d7-4afe-b629-ab5ac9434298)]
+interface nsIBrowserSearchService : nsISupports
+{
+  /**
+   * Adds a new search engine from the file at the supplied URI.
+   *
+   * @param engineURL
+   *        The URL to the search engine's description file.
+   *
+   * @param type
+   *        An integer representing the plugin file format. Must be one
+   *        of the supported search engine data types defined above.
+   *
+   * @param iconURL the URL to an icon file to be used as the search engine's
+   *        icon.
+   *
+   * @throws NS_ERROR_FAILURE if the type is invalid, or if the description
+   *         file cannot be successfully loaded.
+   */
+  void addEngine(in AString engineURL, in long type, in AString iconURL);
+
+  /**
+   * Adds a new search engine.
+   *
+   * @param name
+   *        The search engine's name. Must be unique. Must not be null.
+   *
+   * @param iconURL
+   *        Optional: A URL string pointing to the icon to be used to represent
+   *        the engine.
+   *
+   * @param alias
+   *        Optional: A unique shortcut that can be used to retrieve the
+   *        search engine.
+   *
+   * @param description
+   *        Optional: a description of the search engine.
+   *
+   * @param method
+   *        The HTTP request method used when submitting a search query.
+   *        Must be a case insensitive value of either "get" or "post".
+   *
+   * @param url
+   *        The URL to which search queries should be sent.
+   *        Must not be null.
+   */
+  void addEngineWithDetails(in AString name,
+                            in AString iconURL,
+                            in AString alias,
+                            in AString description,
+                            in AString method,
+                            in AString url);
+
+  /**
+   * Returns an engine with the specified alias.
+   *
+   * @param   alias
+   *          The search engine's alias.
+   * @returns The corresponding nsISearchEngine object, or null if it doesn't
+   *          exist.
+   */
+  nsISearchEngine getEngineByAlias(in AString alias);
+
+  /**
+   * Returns an engine with the specified name.
+   *
+   * @param   aEngineName
+   *          The name of the engine.
+   * @returns The corresponding nsISearchEngine object, or null if it doesn't
+   *          exist.
+   */
+  nsISearchEngine getEngineByName(in AString aEngineName);
+
+  /**
+   * Returns an array of all installed search engines.
+   *
+   * @returns an array of nsISearchEngine objects.
+   */
+  void getEngines(
+            out unsigned long engineCount, 
+            [retval, array, size_is(engineCount)] out nsISearchEngine engines);
+
+  /**
+   * Returns an array of all installed search engines whose hidden attribute is
+   * false.
+   *
+   * @returns an array of nsISearchEngine objects.
+   */
+  void getVisibleEngines(
+            out unsigned long engineCount, 
+            [retval, array, size_is(engineCount)] out nsISearchEngine engines);
+
+  /**
+   * Removes the search engine. If the search engine is installed in a global
+   * location, this will just hide the engine. If the engine is in the user's
+   * profile directory, it will be removed from disk.
+   *
+   * @param  engine
+   *         The engine to remove.
+   */
+  void removeEngine(in nsISearchEngine engine);
+
+  /**
+   * The default search engine.
+   */
+  readonly attribute nsISearchEngine defaultEngine;
+
+  /**
+   * The currently active search engine.
+   */
+  attribute nsISearchEngine currentEngine;  
+
+};
+
+%{ C++
+/**
+ * The observer topic to listen to for actions performed on installed
+ * search engines.
+ */
+#define SEARCH_ENGINE_TOPIC "browser-search-engine-modified"
+
+/**
+ * Sent when an engine is removed from the data store.
+ */
+#define SEARCH_ENGINE_REMOVED      "engine-removed"
+
+/**
+ * Sent when an engine is changed. This includes when the engine's "hidden"
+ * property is changed.
+ */
+#define SEARCH_ENGINE_CHANGED      "engine-changed"
+
+/**
+ * Sent when an engine is added to the list of available engines.
+ */
+#define SEARCH_ENGINE_ADDED        "engine-added"
+
+/**
+ * Sent when a search engine being installed from a remote plugin description
+ * file is completely loaded. This is used internally by the search service as
+ * an indication of when the engine can be added to the internal store, and
+ * therefore should not be used to detect engine availability. It is always
+ * followed by an "added" notification.
+ */
+#define SEARCH_ENGINE_LOADED       "engine-loaded"
+
+/**
+ * Sent when the "current" engine is changed.
+ */
+#define SEARCH_ENGINE_CURRENT      "engine-current";
+
+%}
diff --git a/browser/components/search/nsSearchService.js b/browser/components/search/nsSearchService.js
new file mode 100755
index 00000000000..88f1fe2c7da
--- /dev/null
+++ b/browser/components/search/nsSearchService.js
@@ -0,0 +1,2071 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Browser Search Service.
+#
+# The Initial Developer of the Original Code is
+# Google Inc.
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Ben Goodger <beng@google.com> (Original author)
+#   Gavin Sharp <gavin@gavinsharp.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** */
+
+const Ci = Components.interfaces;
+const Cc = Components.classes;
+const Cr = Components.results;
+
+const PERMS_FILE      = 0644;
+const PERMS_DIRECTORY = 0755;
+
+const MODE_RDONLY   = 0x01;
+const MODE_WRONLY   = 0x02;
+const MODE_CREATE   = 0x08;
+const MODE_APPEND   = 0x10;
+const MODE_TRUNCATE = 0x20;
+
+const NS_APP_SEARCH_DIR_LIST = "SrchPluginsDL";
+const NS_APP_USER_SEARCH_DIR = "UsrSrchPlugns";
+
+// See documentation in nsIBrowserSearchService.idl.
+const SEARCH_ENGINE_TOPIC        = "browser-search-engine-modified";
+
+const SEARCH_ENGINE_REMOVED      = "engine-removed";
+const SEARCH_ENGINE_ADDED        = "engine-added";
+const SEARCH_ENGINE_CHANGED      = "engine-changed";
+const SEARCH_ENGINE_LOADED       = "engine-loaded";
+const SEARCH_ENGINE_CURRENT      = "engine-current";
+
+const XPCOM_SHUTDOWN_TOPIC       = "xpcom-shutdown";
+
+// File extensions for search plugin description files
+const XML_FILE_EXT      = "xml";
+const SHERLOCK_FILE_EXT = "src";
+
+const ICON_DATAURL_PREFIX = "data:image/x-icon;base64,";
+
+// Supported extensions for Sherlock plugin icons
+const SHERLOCK_ICON_EXTENSIONS = [".gif", ".jpg", ".jpeg", ".png"];
+
+// Set an arbitrary cap on the maximum icon size. Without this, large icons can
+// cause big delays when loading them at startup.
+const MAX_ICON_SIZE   = 10000;
+
+// Default charset to use for sending search parameters. This is used to match
+// previous nsInternetSearchService behavior.
+const DEFAULT_QUERY_CHARSET = "ISO-8859-1";
+
+const SEARCH_BUNDLE = "chrome://browser/locale/search.properties";
+const BRAND_BUNDLE = "chrome://branding/locale/brand.properties";
+
+const kOpenSearchNS_10     = "http://a9.com/-/spec/opensearchdescription/1.0/";
+const kOpenSearchNS_11     = "http://a9.com/-/spec/opensearchdescription/1.1/";
+const kOpenSearchLocalName = "OpenSearchDescription";
+
+const kMozSearchNS_10     = "http://www.mozilla.org/2006/browser/search/";
+const kMozSearchLocalName = "SearchPlugin";
+
+// Empty base document used to serialize engines to file.
+const EMPTY_DOC = "<?xml version=\"1.0\"?>\n" +
+                  "<" + kMozSearchLocalName +
+                  " xmlns=\"" + kMozSearchNS_10 + "\"" +
+                  " xmlns:os=\"" + kOpenSearchNS_11 + "\"" +
+                  "/>";
+
+const BROWSER_SEARCH_PREF = "browser.search.";
+
+// Unsupported search parameters.
+// XXX We do use inputEncoding - should consider having it available. This
+// would require doing multiple parameter substition, so just having
+// searchTerms is sufficient for now.
+const kIllegalWords = /(\{count\})|(\{startIndex\})|(\{startPage\})|(\{language\})|(\{outputEncoding\})|(\{inputEncoding\})/;
+
+const kValidWords = /\{searchTerms\}/gi;
+const kUserDefined = "{searchTerms}";
+
+// Regular expression matching whitespace-only or commented out lines in a
+// Sherlock file.
+const kUselessLine = /^\s*($|#)/i;
+
+/**
+ * Used to determine whether an "input" line from a Sherlock file is a "user
+ * defined" input. That is, check for the string "user", preceded by either
+ * whitespace or a quote, followed by any of ">", "=", """, "'", whitespace,
+ * a slash, "+", or EOL.
+ */
+const kIsUserInput = /(\s|["'=])user(\s|[>="'\/\\+]|$)/i;
+
+/**
+ * Outputs aText to the JavaScript console as well as to stdout, if the search
+ * logging pref (browser.search.log) is set to true.
+ */
+function LOG(aText) {
+  var prefB = Cc["@mozilla.org/preferences-service;1"].
+              getService(Ci.nsIPrefBranch);
+  var shouldLog = false;
+  try {
+    shouldLog = prefB.getBoolPref(BROWSER_SEARCH_PREF + "log");
+  } catch (ex) {}
+
+  if (shouldLog) {
+    dump("*** Search: " + aText + "\n");
+    var consoleService = Cc["@mozilla.org/consoleservice;1"].
+                         getService(Ci.nsIConsoleService);
+    consoleService.logStringMessage(aText);
+  }
+}
+
+//XXX Bug 327349: Copied from controller.js, this belongs in a global place
+function ASSERT(condition, message) {
+  if (!condition) {
+    var caller = arguments.callee.caller;
+    var str = "ASSERT: ";
+    str += message;
+    LOG(str);
+    var assertionText = str + "\n";
+
+    var stackText = "Stack Trace: \n";
+    if (true) {
+      var count = 0;
+      while (caller) {
+        stackText += count++ + ":" + caller.name + "(";
+        for (var i = 0; i < caller.arguments.length; ++i) {
+          var arg = caller.arguments[i];
+          stackText += arg;
+          if (i < caller.arguments.length - 1)
+            stackText += ",";
+        }
+        stackText += ")\n";
+        caller = caller.arguments.callee.caller;
+      }
+    }
+    var ps = Cc["@mozilla.org/embedcomp/prompt-service;1"].
+             getService(Ci.nsIPromptService);
+    ps.alert(null, "Assertion Failed", assertionText + stackText);
+    LOG(assertionText);
+  }
+}
+
+function ERROR(message, resultCode) {
+  ASSERT(false, message);
+  throw resultCode;
+}
+
+/**
+ * Ensures an assertion is met before continuing. Should be used to indicate
+ * fatal errors.
+ * @param  assertion
+ *         An assertion that must be met
+ * @param  message
+ *         A message to display if the assertion is not met
+ * @param  resultCode
+ *         The NS_ERROR_* value to throw if the assertion is not met
+ * @throws resultCode
+ */
+function ENSURE_WARN(assertion, message, resultCode) {
+  ASSERT(assertion, message);
+  if (!assertion)
+    throw resultCode;
+}
+
+/**
+ * Ensures an assertion is met before continuing, but does not warn the user.
+ * Used to handle normal failure conditions.
+ * @param  assertion
+ *         An assertion that must be met
+ * @param  message
+ *         A message to display if the assertion is not met
+ * @param  resultCode
+ *         The NS_ERROR_* value to throw if the assertion is not met
+ * @throws resultCode
+ */
+function ENSURE(assertion, message, resultCode) {
+  if (!assertion) {
+    LOG(message, true);
+    throw resultCode;
+  }
+}
+
+/**
+ * Ensures an argument assertion is met before continuing.
+ * @param  assertion
+ *         An argument assertion that must be met
+ * @param  message
+ *         A message to display if the assertion is not met
+ * @throws NS_ERROR_INVALID_ARG for invalid arguments
+ */
+function ENSURE_ARG(assertion, message) {
+  ENSURE(assertion, message, Cr.NS_ERROR_INVALID_ARG);
+}
+
+//XXX Bug 326854: no btoa for components, use our own
+/**
+ * Encodes an array of bytes into a string using the base 64 encoding scheme.
+ * @param aBytes
+ *        An array of bytes to encode.
+ */
+function b64(aBytes) {
+  const B64_CHARS =
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  var out = "", bits = 0, i, j;
+
+  while (aBytes.length >= 3) {
+    bits = 0;
+    for (i=0; i<3; i++) {
+      bits <<= 8;
+      bits |= aBytes[i];
+    }
+    for (j=18; j>=0; j-=6)
+      out += B64_CHARS[(bits>>j) & 0x3F];
+
+    aBytes.splice(0, 3);
+  }
+
+  switch (aBytes.length) {
+    case 2:
+      out += B64_CHARS[(aBytes[0]>>2) & 0x3F];
+      out += B64_CHARS[((aBytes[0] & 0x03) << 4) | ((aBytes[1] >> 4) & 0x0F)];
+      out += B64_CHARS[((aBytes[1] & 0x0F) << 2)];
+      out += "=";
+      break;
+    case 1:
+      out += B64_CHARS[(aBytes[0]>>2) & 0x3F];
+      out += B64_CHARS[(aBytes[0] & 0x03) << 4];
+      out += "==";
+      break;
+  }
+  return out;
+}
+
+function iconLoadListener(aChannel, aEngine) {
+  this._countRead = 0;
+  this._channel = aChannel;
+  this._bytes = [],
+  this._engine = aEngine.QueryInterface(Ci.nsISearchEngine);
+}
+iconLoadListener.prototype = {
+  _channel: null,
+  _countRead: 0,
+  _engine: null,
+  _stream: null,
+
+  QueryInterface: function SRCH_iconLoad_QI(aIID) {
+    if (aIID.equals(Ci.nsISupports)           ||
+        aIID.equals(Ci.nsIRequestObserver)    ||
+        aIID.equals(Ci.nsIStreamListener)     ||
+        aIID.equals(Ci.nsIChannelEventSink)   ||
+        aIID.equals(Ci.nsIInterfaceRequestor) ||
+        // See XXX comment below
+        aIID.equals(Ci.nsIHttpEventSink)      ||
+        aIID.equals(Ci.nsIProgressEventSink)  ||
+        false)
+      return this;
+
+    throw Cr.NS_ERROR_NO_INTERFACE;
+  },
+
+  // nsIRequestObserver
+  onStartRequest: function SRCH_iconLoadStartR(aRequest, aContext) {
+    LOG("iconLoadListener: Starting icon request.");
+    this._stream = Cc["@mozilla.org/binaryinputstream;1"].
+                   createInstance(Ci.nsIBinaryInputStream);
+  },
+
+  onStopRequest: function SRCH_iconLoadStopR(aRequest, aContext, aStatusCode) {
+    LOG("iconLoadListener: Stopping icon request.");
+    var httpChannel = this._channel.QueryInterface(Ci.nsIHttpChannel);
+    if ((httpChannel && httpChannel.requestSucceeded) &&
+        Components.isSuccessCode(aStatusCode)         &&
+        this._countRead > 0) {
+
+      if (this._countRead < MAX_ICON_SIZE) {
+        var str = b64(this._bytes);
+        this._engine._iconURI = makeURI(ICON_DATAURL_PREFIX + str);
+
+        // The engine might not have a file yet, if it's being downloaded,
+        // because the request for the engine file itself (_onLoad) may not yet
+        // have occured. In that case, this change will be written to file when
+        // _onLoad is called.
+        if (this._engine._file)
+          this._engine._serializeToFile();
+        notifyAction(this._engine, SEARCH_ENGINE_CHANGED);
+      }
+    }
+    this._channel = null;
+    this._engine  = null;
+  },
+
+  // nsIStreamListener
+  onDataAvailable: function SRCH_iconLoadDAvailable(aRequest, aContext,
+                                                    aInputStream, aOffset,
+                                                    aCount) {
+    this._stream.setInputStream(aInputStream);
+
+    // Get a byte array of the data
+    this._bytes = this._bytes.concat(this._stream.readByteArray(aCount));
+    this._countRead += aCount;
+  },
+
+  // nsIChannelEventSink
+  onChannelRedirect: function SRCH_iconLoadCRedirect(aOldChannel, aNewChannel,
+                                                     aFlags) {
+    this._channel = aNewChannel;
+  },
+
+  // nsIInterfaceRequestor
+  getInterface: function SRCH_iconLoad_GI(aIID) {
+    return this.QueryInterface(aIID);
+  },
+
+  // XXX bug 253127
+  // nsIHttpEventSink
+  onRedirect: function (aChannel, aNewChannel) {},
+  // nsIProgressEventSink
+  onProgress: function (aRequest, aContext, aProgress, aProgressMax) {},
+  onStatus: function (aRequest, aContext, aStatus, aStatusArg) {}
+}
+
+
+/**
+ * Used to verify a given DOM node's localName and namespaceURI.
+ * @param aElement
+ *        The element to verify.
+ * @param aLocalNameArray
+ *        An array of strings to compare against aElement's localName.
+ * @param aNameSpaceArray
+ *        An array of strings to compare against aElement's namespaceURI.
+ *
+ * @returns false if aElement is null, or if it's localName or namespaceURI
+ *          does not match one of the elements in the aLocalNameArray or
+ *          aNameSpaceArray arrays, respectively.
+ * @throws NS_ERROR_INVALID_ARG if aLocalNameArray or aNameSpaceArray are null.
+ */
+function checkNameSpace(aElement, aLocalNameArray, aNameSpaceArray) {
+  ENSURE_ARG(aLocalNameArray && aNameSpaceArray, "missing aLocalNameArray or \
+             aNameSpaceArray for checkNameSpace");
+  return (aElement                                                &&
+          (aLocalNameArray.indexOf(aElement.localName)    != -1)  &&
+          (aNameSpaceArray.indexOf(aElement.namespaceURI) != -1));
+}
+
+/**
+ * Safely close a nsISafeOutputStream.
+ * @param aFOS
+ *        The file output stream to close.
+ */
+function closeSafeOutputStream(aFOS) {
+  if (aFOS instanceof Ci.nsISafeOutputStream) {
+    try {
+      aFOS.finish();
+      return;
+    } catch (e) { }
+  }
+  aFOS.close();
+}
+
+/**
+ * Wrapper function for nsIIOService::newURI.
+ * @param aURLSpec
+ *        The URL string from which to create an nsIURI.
+ * @returns an nsIURI object, or null if the creation of the URI failed.
+ */
+function makeURI(aURLSpec) {
+  var ios = Cc["@mozilla.org/network/io-service;1"].
+            getService(Ci.nsIIOService);
+  try {
+    return ios.newURI(aURLSpec, null, null);
+  } catch (ex) { }
+
+  return null;
+}
+
+/**
+ * Gets a directory from the directory service.
+ * @param aKey
+ *        The directory service key indicating the directory to get.
+ */
+function getDir(aKey) {
+  ENSURE_ARG(aKey, "getDir requires a directory key!");
+
+  var fileLocator = Cc["@mozilla.org/file/directory_service;1"].
+                    getService(Ci.nsIProperties);
+  var dir = fileLocator.get(aKey, Ci.nsIFile);
+  return dir;
+}
+
+// This isn't a full list - this is just copied over from
+// nsInternetSearchService to maintain backwards compat with Firefox 1.0.x
+const kCharsetCodes = [];
+kCharsetCodes[0] = "x-mac-roman";
+kCharsetCodes[6] = "x-mac-greek";
+kCharsetCodes[35] = "x-mac-turkish";
+kCharsetCodes[513] = "ISO-8859-1";
+kCharsetCodes[514] = "ISO-8859-2";
+kCharsetCodes[517] = "ISO-8859-5";
+kCharsetCodes[518] = "ISO-8859-6";
+kCharsetCodes[519] = "ISO-8859-7";
+kCharsetCodes[520] = "ISO-8859-8";
+kCharsetCodes[521] = "ISO-8859-9";
+kCharsetCodes[1049] = "IBM864";
+kCharsetCodes[1280] = "windows-1252";
+kCharsetCodes[1281] = "windows-1250";
+kCharsetCodes[1282] = "windows-1251";
+kCharsetCodes[1283] = "windows-1253";
+kCharsetCodes[1284] = "windows-1254";
+kCharsetCodes[1285] = "windows-1255";
+kCharsetCodes[1286] = "windows-1256";
+kCharsetCodes[1536] = "us-ascii";
+kCharsetCodes[1584] = "GB2312";
+kCharsetCodes[1585] = "x-gbk";
+kCharsetCodes[1600] = "EUC-KR";
+kCharsetCodes[2080] = "ISO-2022-JP";
+kCharsetCodes[2096] = "ISO-2022-CN";
+kCharsetCodes[2112] = "ISO-2022-KR";
+kCharsetCodes[2336] = "EUC-JP";
+kCharsetCodes[2352] = "GB2312";
+kCharsetCodes[2353] = "x-euc-tw";
+kCharsetCodes[2368] = "EUC-KR";
+kCharsetCodes[2561] = "Shift_JIS";
+kCharsetCodes[2562] = "KOI8-R";
+kCharsetCodes[2563] = "Big5";
+kCharsetCodes[2565] = "HZ-GB-2312";
+
+/**
+ * Gets a character set name from a given code.
+ * @param aCode
+ *        One of the codes from the kCharsetCodes table, representing the
+ *        requested charset.
+ * @returns the requested character set name, or the default character set name
+ *          if it doesn't exist.
+ */
+function getCharSetFromCode(aCode) {
+  if (kCharsetCodes[aCode])
+    return kCharsetCodes[aCode];
+
+  return getLocalizedPref("intl.charset.default", DEFAULT_QUERY_CHARSET);
+}
+
+/**
+ * Wrapper for nsIPrefBranch::getComplexValue.
+ * @param aPrefName
+ *        The name of the pref to get.
+ * @returns aDefault if the requested pref doesn't exist.
+ */
+function getLocalizedPref(aPrefName, aDefault) {
+  var prefB = Cc["@mozilla.org/preferences-service;1"].
+              getService(Ci.nsIPrefBranch);
+  const nsIPLS = Ci.nsIPrefLocalizedString;
+  try {
+    return prefB.getComplexValue(aPrefName, nsIPLS).data;
+  } catch (ex) {}
+
+  return aDefault;
+}
+
+/**
+ * Wrapper for nsIPrefBranch::setComplexValue.
+ * @param aPrefName
+ *        The name of the pref to set.
+ * @param aValue
+ *        The value of the pref.
+ */
+function setLocalizedPref(aPrefName, aValue) {
+  var prefB = Cc["@mozilla.org/preferences-service;1"].
+              getService(Ci.nsIPrefBranch);
+  var pls = Cc["@mozilla.org/pref-localizedstring;1"].
+            createInstance(Ci.nsIPrefLocalizedString);
+  pls.data = aValue;
+  prefB.setComplexValue(aPrefName, Ci.nsIPrefLocalizedString, pls);
+}
+
+/**
+ * Wrapper for nsIPrefBranch::setBoolPref.
+ * @param aPrefName
+ *        The name of the pref to set.
+ * @param aValue
+ *        The value of the pref.
+ */
+function setBoolPref(aName, aVal) {
+  var prefB = Cc["@mozilla.org/preferences-service;1"].
+              getService(Ci.nsIPrefBranch);
+  prefB.setBoolPref(aName, aVal);
+}
+
+/**
+ * Wrapper for nsIPrefBranch::getBoolPref.
+ * @param aPrefName
+ *        The name of the pref to get.
+ * @returns aDefault if the requested pref doesn't exist.
+ */
+function getBoolPref(aName, aDefault) {
+  var prefB = Cc["@mozilla.org/preferences-service;1"].
+              getService(Ci.nsIPrefBranch);
+  try {
+    return prefB.getBoolPref(aName);
+  } catch (ex) {
+    return aDefault;
+  }
+}
+
+/**
+ * Get a unique nsIFile object with a sanitized name, based on the engine name.
+ * @param aName
+ *        A name to "sanitize". Can be an empty string, in which case a random
+ *        8 character filename will be produced.
+ * @param aExt
+ *        A file extension to use for the file. If not provided, defaults to
+ *        XML_FILE_EXT.
+ * @returns A nsIFile object in the user's search engines directory with a
+ *          unique sanitized name.
+ */
+function getSanitizedFile(aName) {
+  var fileName = sanitizeName(aName) + "." + XML_FILE_EXT;
+  var file = getDir(NS_APP_USER_SEARCH_DIR);
+  file.append(fileName);
+  file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, PERMS_FILE);
+  return file;
+}
+
+/**
+ * Removes all characters not in the "chars" string from aName.
+ *
+ * @returns a sanitized name to be used as a filename, or a random name if a
+ *          sanitized name cannot be obtained (if aName contains no valid
+ *          characters).
+ */
+function sanitizeName(aName) {
+  const chars = "abcdefghijklmnopqrstuvwxyz0123456789";
+  var name = aName.toLowerCase()
+                  .split("").filter(function (el) {
+                                      return chars.indexOf(el) != -1;
+                                    }).join("");
+  if (!name) {
+    // Our input had no valid characters - use a random name
+    var cl = chars.length;
+    for (var i = 0; i < 8; ++i)
+      name += chars.charAt(Math.round(Math.random() * cl));
+  }
+  return name;
+}
+
+/**
+ * Notifies watchers of SEARCH_ENGINE_TOPIC about changes to an engine or to
+ * the state of the search service.
+ *
+ * @param aEngine
+ *        The nsISearchEngine object to which the change applies.
+ * @param aVerb
+ *        A verb describing the change.
+ *
+ * @see nsIBrowserSearchService.idl
+ */
+function notifyAction(aEngine, aVerb) {
+  var os = Cc["@mozilla.org/observer-service;1"].
+           getService(Ci.nsIObserverService);
+  LOG("NOTIFY: Engine: \"" + aEngine.name + "\"; Verb: \"" + aVerb + "\"");
+  os.notifyObservers(aEngine, SEARCH_ENGINE_TOPIC, aVerb);
+}
+
+/**
+ * Simple object representing a name/value pair.
+ * @throws NS_ERROR_NOT_IMPLEMENTED if the provided value includes unsupported
+ *         parameters.
+ * @see kIllegalWords.
+ */
+function QueryParameter(aName, aValue) {
+  ENSURE_ARG(aName && aValue, "missing name or value for QueryParameter!");
+
+  ENSURE(!kIllegalWords.test(aValue),
+         "Illegal value while creating a QueryParameter",
+         Cr.NS_ERROR_NOT_IMPLEMENTED);
+
+  this.name = aName;
+  this.value = aValue;
+}
+
+/**
+ * Creates an engineURL object, which holds the query URL and all parameters.
+ *
+ * @param aType
+ *        A string containing the name of the MIME type of the search results
+ *        returned by this URL.
+ * @param aMethod
+ *        The HTTP request method. Must be a case insensitive value of either
+ *        "GET" or "POST".
+ * @param aTemplate
+ *        The URL to which search queries should be sent. For GET requests,
+ *        must contain the string "{searchTerms}", to indicate where the user
+ *        entered search terms should be inserted.
+ *
+ * @see http://opensearch.a9.com/spec/1.1/querysyntax/#urltag
+ *
+ * @throws NS_ERROR_NOT_IMPLEMENTED if aType is unsupported, or if aTemplate
+ *         includes unsupported parameters.
+ *
+ * @see kIllegalWords.
+ */
+function EngineURL(aType, aMethod, aTemplate) {
+  ENSURE_ARG(aType && aMethod && aTemplate,
+             "missing type, method or template for EngineURL!");
+
+  var method = aMethod.toUpperCase();
+  var type   = aType.toLowerCase();
+
+  ENSURE_ARG(method == "GET" || method == "POST",
+             "method passed to EngineURL must be \"GET\" or \"POST\"");
+
+  ENSURE(type == "text/html", "EngineURLs must be of type text/html!",
+         Cr.NS_ERROR_NOT_IMPLEMENTED);
+
+  ENSURE(!kIllegalWords.test(aTemplate), "Invalid URL parameter!",
+         Cr.NS_ERROR_NOT_IMPLEMENTED);
+
+  this.type     = type;
+  this.method   = method;
+  this.template = aTemplate;
+  this.params   = [];
+}
+EngineURL.prototype = {
+
+  addParam: function SRCH_EURL_addParam(aName, aValue) {
+    this.params.push(new QueryParameter(aName, aValue));
+  },
+
+  getSubmission: function SRCH_EURL_getSubmission(aData) {
+    /**
+     * From an array of QueryParameter objects, generates a string in the
+     * application/x-www-form-urlencoded format:
+     * name=value&name=value&name=value...
+     * @param   aParams
+     *          An array of QueryParameter objects
+     * @param   aData
+     *          Data to be substituted into parameter values using the
+     *          |kValidWords| regexp
+     * @returns A string of encoded param names and values in
+     *          application/x-www-form-urlencoded format.
+     */
+    function makeQueryString(aParams, aData) {
+      var str = "";
+      for (var i = 0; i < aParams.length; ++i) {
+        var param = aParams[i];
+        var value = param.value.replace(kValidWords, aData);
+        str += (i > 0 ? "&" : "") + param.name + "=" + value;
+      }
+      return str;
+    }
+
+    var url = this.template.replace(kValidWords, aData);
+    var postData = null;
+    var dataString = makeQueryString(this.params, aData);
+    if (this.method == "GET") {
+      // GET method requests have no post data, and append the encoded
+      // text to the url...
+      if (url.indexOf("?") == -1 && dataString)
+        url += "?";
+      url += dataString;
+    } else if (this.method == "POST") {
+      // POST method requests must wrap the encoded text in a MIME
+      // stream and supply that as POSTDATA.
+      var stringStream = Cc["@mozilla.org/io/string-input-stream;1"].
+                         createInstance(Ci.nsIStringInputStream);
+      stringStream.data = dataString;
+
+      postData = Cc["@mozilla.org/network/mime-input-stream;1"].
+                 createInstance(Ci.nsIMIMEInputStream);
+      postData.addHeader("Content-Type", "application/x-www-form-urlencoded");
+      postData.addContentLength = true;
+      postData.setData(stringStream);
+    }
+
+    return new Submission(makeURI(url), postData);
+  },
+
+  /**
+   * Serializes the engine object to a OpenSearch Url element.
+   * @param aDoc
+   *        The document to use to create the Url element.
+   * @param aElement
+   *        The element to which the created Url element is appended.
+   *
+   * @see http://opensearch.a9.com/spec/1.1/querysyntax/#urltag
+   */
+  _serializeToElement: function SRCH_EURL_serializeToEl(aDoc, aElement) {
+    var url = aDoc.createElementNS(kOpenSearchNS_11, "Url");
+    url.setAttribute("type", this.type);
+    url.setAttribute("method", this.method);
+    url.setAttribute("template", this.template);
+
+    for (var i = 0; i < this.params.length; ++i) {
+      var param = aDoc.createElementNS(kOpenSearchNS_11, "Param");
+      param.setAttribute("name", this.params[i].name);
+      param.setAttribute("value", this.params[i].value);
+      url.appendChild(aDoc.createTextNode("\n  "));
+      url.appendChild(param);
+    }
+    url.appendChild(aDoc.createTextNode("\n"));
+    aElement.appendChild(url);
+  }
+};
+
+/**
+ * nsISearchEngine constructor.
+ * @param aLocation
+ *        A nsILocalFile or nsIURI object representing the location of the
+ *        search engine data file.
+ * @param aSourceDataType
+ *        The data type of the file used to describe the engine. Must be either
+ *        DATA_XML or DATA_TEXT.
+ * @param aIsReadOnly
+ *        Boolean indicating whether the engine should be treated as read-only.
+ *        Read only engines cannot be serialized to file.
+ */
+function Engine(aLocation, aSourceDataType, aIsReadOnly) {
+  this._dataType = aSourceDataType;
+  this._readOnly = aIsReadOnly;
+  this._urls = [];
+
+  if (aLocation instanceof Ci.nsILocalFile) {
+    ENSURE(aLocation.exists(),
+           "Can't init an engine from a non-existent file!",
+           Cr.NS_ERROR_FAILURE);
+
+    // we already have a file (e.g. loading engines from disk)
+    this._file = aLocation;
+    this._getData();
+
+    // parse the data and set up fields accordingly
+    this._init();
+  } else if (aLocation instanceof Ci.nsIURI) {
+    this._uri = aLocation;
+    switch (aLocation.scheme) {
+      case "https":
+      case "http":
+      case "data":
+      case "file":
+      case "resource":
+        // we have a URI, and no file
+        this._getDataFromURI(aLocation);
+        break;
+      case "javascript":
+        // Passing a javascript URI to addEngine causes a crash (bug 328697).
+        // Fall through...
+      default:
+        ERROR("Invalid URI passed to the nsISearchEngine constructor",
+              Cr.NS_ERROR_INVALID_ARG);
+    }
+  } else
+    ERROR("Engine location is neither a File nor a URI object",
+          Cr.NS_ERROR_INVALID_ARG);
+}
+
+Engine.prototype = {
+  // The engine's alias.
+  _alias: null,
+  // The data describing the engine. Is either an array of lines, for Sherlock
+  // files, or an XML document element, for XML plugins.
+  _data: null,
+  // The engine's data type. See data types (DATA_) defined above.
+  _dataType: null,
+  // Whether or not the engine is readonly.
+  _readOnly: true,
+  // The engine's description
+  _description: "",
+  // The file from which the plugin was loaded.
+  _file: null,
+  // Whether the engine is hidden from the user.
+  _hidden: null,
+  // The XMLHTTPRequest object used to download the engine.
+  // (null for engines loaded from disk)
+  _req: null,
+  // The engine's name.
+  _name: null,
+  // The engine type. See engine types (TYPE_) defined above.
+  _type: null,
+  // The name of the charset used to submit the search terms.
+  _queryCharset: null,
+  // The URI object from which the engine was retrieved.
+  // This is null for local plugins, and is only used for error messages and
+  // logging.
+  _uri: null,
+
+  /**
+   * Retrieves the data from the engine's file. If the engine's dataType is
+   * XML, the document element is placed in the engine's data field. For text
+   * engines, the data is just read directly from file and placed as an array
+   * of lines in the engine's data field.
+   */
+  _getData: function SRCH_ENG_getData() {
+    var fileInStream = Cc["@mozilla.org/network/file-input-stream;1"].
+                       createInstance(Ci.nsIFileInputStream);
+
+    fileInStream.init(this._file, MODE_RDONLY, PERMS_FILE, false);
+
+    switch (this._dataType) {
+      case Ci.nsISearchEngine.DATA_XML:
+
+        var domParser = Cc["@mozilla.org/xmlextras/domparser;1"].
+                        createInstance(Ci.nsIDOMParser);
+        var doc = domParser.parseFromStream(fileInStream, "UTF-8",
+                                            this._file.fileSize,
+                                            "text/xml");
+
+        this._data = doc.documentElement;
+        break;
+      case Ci.nsISearchEngine.DATA_TEXT:
+        fileInStream.QueryInterface(Ci.nsILineInputStream);
+
+        var line = { value: "" };
+        var more = false;
+        var lines = [];
+
+        do {
+          more = fileInStream.readLine(line);
+          // Filter out comments and whitespace-only lines
+          if (!(kUselessLine.test(line.value)))
+            lines.push(line.value);
+        } while (more);
+
+        this._data = lines;
+
+        break;
+      default:
+        ERROR("Bogus engine _dataType: \"" + this._dataType + "\"",
+              Cr.NS_ERROR_UNEXPECTED);
+    }
+
+    fileInStream.close();
+  },
+
+  /**
+   * Retrieves the engine data from a URI.
+   * @param   aURI
+   *          The URL to transfer from.
+   */
+  _getDataFromURI: function SRCH_ENG_getDataFromURI(aURI) {
+    ENSURE_ARG(aURI instanceof Ci.nsIURI, "Invalid URI for _getDataFromURI!");
+
+    LOG("_getDataFromURI: Downloading engine from: \"" + aURI.spec + "\".");
+    var mimeType = "";
+    switch (this._dataType) {
+      case Ci.nsISearchEngine.DATA_XML:
+        mimeType = "text/xml";
+        break;
+      case Ci.nsISearchEngine.DATA_TEXT:
+        mimeType = "text/plain";
+        break;
+      default:
+        ERROR("Bogus engine _dataType: \"" + this._dataType + "\"",
+              Cr.NS_ERROR_UNEXPECTED);
+    }
+
+    this._req = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].
+                createInstance(Ci.nsIXMLHttpRequest);
+    this._req.open("GET", aURI.spec, true);
+    this._req.overrideMimeType(mimeType);
+    this._req.setRequestHeader("Cache-Control", "no-cache");
+
+    var self = this;
+    this._req.send(null);
+    this._req.onerror = function (event) { self._onError(event); };
+    this._req.onload  = function (event) { self._onLoad(event);  };
+  },
+
+  /**
+   * Handle an error during the load of an engine by prompting the user to
+   * notify him that the load failed.
+   */
+  _onError: function SRCH_ENG_onError(aEvent) {
+    var sbs = Cc["@mozilla.org/intl/stringbundle;1"].
+              getService(Ci.nsIStringBundleService);
+    var searchBundle = sbs.createBundle(SEARCH_BUNDLE);
+    var brandBundle = sbs.createBundle(BRAND_BUNDLE);
+    var brandName = brandBundle.GetStringFromName("brandShortName");
+    var title = searchBundle.GetStringFromName("error_loading_engine_title");
+    var text = searchBundle.formatStringFromName("error_loading_engine_msg",
+                                                 [brandName, this._location],
+                                                 2);
+
+    var ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
+             getService(Ci.nsIWindowWatcher);
+    ww.getNewPrompter(null).alert(title, text);
+  },
+
+  /**
+   * Handle the successful download of an engine. Initializes the engine and
+   * triggers parsing of the data. The engine is then flushed to disk. Notifies
+   * the search service once initialization is complete.
+   */
+  _onLoad: function SRCH_ENG_onLoad(aEvent) {
+
+    var httpChannel = this._req.channel.QueryInterface(Ci.nsIHttpChannel);
+    if (this._req.readyState != 4 || !httpChannel.requestSucceeded) {
+      this._onError();
+      LOG("_onLoad: Request for " + this._location + " failed!");
+      return;
+    }
+
+    switch (this._dataType) {
+      case Ci.nsISearchEngine.DATA_XML:
+        this._data = this._req.responseXML.documentElement;
+        break;
+      case Ci.nsISearchEngine.DATA_TEXT:
+        this._data = this._req.responseText.split(/(\r\n|\n\r|\r|\n)/);
+
+        // Filter out comments and whitespace-only lines.
+        this._data.filter(function (line) {
+                            return (!kUselessLine.test(line));
+                          });
+        break;
+      default:
+        this._onError();
+        LOG("_onLoad: Bogus engine _dataType: \"" + this._dataType + "\"");
+        return;
+    }
+    try {
+      // Initialize the engine from the obtained data
+      this._init();
+    } catch (ex) {
+      // Report an error to the user
+      LOG("_onLoad: Failed to init engine!\n" + ex);
+      this._onError();
+      return;
+    }
+
+    // Write the engine to file
+    this._serializeToFile();
+
+    // Notify the search service of the sucessful load
+    notifyAction(this, SEARCH_ENGINE_LOADED);
+  },
+
+  /**
+   * Sets the .iconURI property of the engine.
+   *
+   *  @param aIconURL
+   *         A URI string pointing to the engine's icon. Must have a http[s] or
+   *         data scheme. Icons with HTTP[S] schemes will be downloaded and
+   *         converted to data URIs for storage in the engine XML files, if
+   *         the engine is not readonly.
+   */
+  _setIcon: function SRCH_ENG_setIcon(aIconURL) {
+
+    var uri = makeURI(aIconURL);
+
+    // Ignore bad URIs
+    if (!uri)
+      return;
+
+    LOG("_setIcon: Setting icon url \"" + uri.spec + "\" for engine \""
+        + this.name + "\".");
+    // Only accept remote icons from http[s]
+    switch (uri.scheme) {
+      case "data":
+        this._iconURI = uri;
+        break;
+      case "http":
+      case "https":
+        // No use downloading the icon if the engine file is read-only
+        // XXX could store the data: URI in a pref... ew?
+        if (!this._readOnly) {
+          LOG("_setIcon: Downloading icon: \"" + uri.spec +
+              "\" for engine: \"" + this.name + "\"");
+          var ios = Cc["@mozilla.org/network/io-service;1"].
+                    getService(Ci.nsIIOService);
+          var chan = ios.newChannelFromURI(uri);
+          var listener = new iconLoadListener(chan, this);
+          chan.notificationCallbacks = listener;
+          chan.asyncOpen(listener, null);
+        }
+        break;
+    }
+  },
+
+  /**
+   * Initialize this Engine object from the collected data.
+   */
+  _init: function SRCH_ENG_init() {
+
+    ENSURE_WARN(this._data, "Can't init an engine with no data!",
+                Cr.NS_ERROR_UNEXPECTED);
+
+    // Find out what type of engine we are
+    switch (this._dataType) {
+      case Ci.nsISearchEngine.DATA_XML:
+        if (checkNameSpace(this._data, [kMozSearchLocalName],
+            [kMozSearchNS_10])) {
+
+          LOG("_init: Initing MozSearch plugin from " + this._location);
+
+          this._type = Ci.nsISearchEngine.TYPE_MOZSEARCH;
+          this._parseAsMozSearch();
+
+        } else if (checkNameSpace(this._data, [kOpenSearchLocalName],
+                   [kOpenSearchNS_11, kOpenSearchNS_10])) {
+
+          LOG("_init: Initing OpenSearch plugin from " + this._location);
+
+          this._type = Ci.nsISearchEngine.TYPE_OPENSEARCH;
+          this._parseAsOpenSearch();
+
+        } else
+          ENSURE(false, this._location + " is not a valid search plugin.",
+                 Cr.NS_ERROR_FAILURE);
+
+        break;
+      case Ci.nsISearchEngine.DATA_TEXT:
+        LOG("_init: Initing Sherlock plugin from " + this._location);
+
+        // the only text-based format we support is Sherlock
+        this._type = Ci.nsISearchEngine.TYPE_SHERLOCK;
+        this._parseAsSherlock();
+    }
+
+    // If we don't yet have a file (i.e. we instantiated an engine object from
+    // passed in URL), get one now
+    if (!this._file)
+      this._file = getSanitizedFile(this.name);
+
+    // Generate a unique ID for this engine. Use the name of the engine, URI
+    // encoded because pref names can only contain certain characters
+    this._pref = BROWSER_SEARCH_PREF + "engine." +
+                 encodeURIComponent(this.name) + ".";
+  },
+
+  /**
+   * Initialize this Engine object from a collection of metadata.
+   */
+  _initFromMetadata: function SRCH_ENG_initMetaData(aName, aIconURL, aAlias,
+                                                    aDescription, aMethod,
+                                                    aTemplate) {
+    ENSURE_WARN(!this._readOnly,
+                "Can't call _initFromMetaData on a readonly engine!",
+                Cr.NS_ERROR_FAILURE);
+
+    this._name = aName;
+    this._alias = aAlias;
+    this._description = aDescription;
+    this._setIcon(aIconURL);
+
+    this._urls.push(new EngineURL("text/html", aMethod, aTemplate));
+
+    this._serializeToFile();
+  },
+
+  /**
+   * Extracts data from an OpenSearch URL element and creates an EngineURL
+   * object which is then added to the engine's list of URLs.
+   *
+   * @see http://opensearch.a9.com/spec/1.1/querysyntax/#urltag.
+   * @see EngineURL()
+   */
+  _parseURL: function SRCH_ENG_parseURL(aElement) {
+    var type     = aElement.getAttribute("type");
+    var method   = aElement.getAttribute("method");
+    var template = aElement.getAttribute("template");
+
+    var url = new EngineURL(type, method, template);
+
+    for (var i = 0; i < aElement.childNodes.length; ++i) {
+      var param = aElement.childNodes[i];
+      if (param.localName == "Param")
+        url.addParam(param.getAttribute("name"), param.getAttribute("value"));
+    }
+    this._urls.push(url);
+  },
+
+  /**
+   * Get the icon from an OpenSearch Image element.
+   * @see http://opensearch.a9.com/spec/1.1/description/#image
+   */
+  _parseImage: function SRCH_ENG_parseImage(aElement) {
+    LOG("_parseImage: Image textContent: \"" + aElement.textContent + "\"");
+    if (aElement.getAttribute("width")  == "16" &&
+        aElement.getAttribute("height") == "16") {
+      this._setIcon(aElement.textContent);
+    }
+  },
+
+  _parseAsMozSearch: function SRCH_ENG_parseAsMoz() {
+    //XXX for now, just forward to the OpenSearch parser
+    this._parseAsOpenSearch();
+  },
+
+  /**
+   * Extract search engine information from the collected data to initialize
+   * the engine object.
+   */
+  _parseAsOpenSearch: function SRCH_ENG_parseAsOS() {
+    var doc = this._data;
+    for (var i = 0; i < doc.childNodes.length; ++i) {
+      var child = doc.childNodes[i];
+      switch (child.localName) {
+        case "ShortName":
+          this._name = child.textContent;
+          break;
+        case "Description":
+          this._description = child.textContent;
+          break;
+        case "Url":
+          this._parseURL(child);
+          break;
+        case "Image":
+          this._parseImage(child);
+          break;
+        case "Alias":
+          this._alias = child.textContent;
+          break;
+        case "InputEncoding":
+          this._queryCharset = child.textContent.toUpperCase();
+          break;
+      }
+    }
+    ENSURE(this.name && (this._urls.length > 0),
+           "_parseAsOpenSearch: No name, or missing URL!",
+           Cr.NS_ERROR_FAILURE);
+  },
+
+  /**
+   * Extract search engine information from the collected data to initialize
+   * the engine object.
+   */
+  _parseAsSherlock: function SRCH_ENG_parseAsSherlock() {
+    /**
+     * Trims leading and trailing whitespace from aStr.
+     */
+    function sTrim(aStr) {
+      return aStr.replace(/^\s+/g, "").replace(/\s+$/g, "");
+    }
+
+    /**
+     * Extracts one Sherlock "section" from aSource. A section is essentially
+     * an HTML element with attributes, but each attribute must be on a new
+     * line, by definition.
+     *
+     * @param aLines
+     *        An array of lines from the sherlock file.
+     * @param aSection
+     *        The name of the section (e.g. "search" or "browser"). This value
+     *        is not case sensitive.
+     * @returns an object whose properties correspond to the section's
+     *          attributes.
+     */
+    function getSection(aLines, aSection) {
+      LOG("_parseAsSherlock::getSection: Sherlock lines:\n" +
+          aLines.join("\n"));
+      var lines = aLines;
+      var startMark = new RegExp("^\\s*<" + aSection.toLowerCase() + "\\s*",
+                                 "gi");
+      var endMark   = /\s*>\s*$/gi;
+
+      var foundStart = false;
+      var startLine, numberOfLines;
+      // Find the beginning and end of the section
+      for (var i=0; i<lines.length; i++) {
+        if (foundStart) {
+          if (endMark.test(lines[i])) {
+            numberOfLines = i - startLine;
+            // Remove the end marker
+            lines[i] = lines[i].replace(endMark, "");
+            // If the endmarker was not the only thing on the line, include
+            // this line in the results
+            if (lines[i])
+              numberOfLines++;
+            break;
+          }
+        } else {
+          if (startMark.test(lines[i])) {
+            foundStart = true;
+            // Remove the start marker
+            lines[i] = lines[i].replace(startMark, "");
+            startLine = i;
+            // If the line is empty, don't include it in the result
+            if (!lines[i])
+              startLine++;
+          }
+        }
+      }
+      LOG("_parseAsSherlock::getSection: Start index: " + startLine +
+          "\nNumber of lines: " + numberOfLines);
+      lines = lines.splice(startLine, numberOfLines);
+      LOG("_parseAsSherlock::getSection: Section lines:\n" +
+          lines.join("\n"));
+
+      var section = {};
+      for (var i=0; i<lines.length; i++) {
+        var line = sTrim(lines[i]);
+
+        var els = line.split("=");
+        var name = sTrim(els.shift().toLowerCase());
+        var value = sTrim(els.join("="));
+
+        if (!name || !value)
+          continue;
+
+        // Strip leading and trailing whitespace, remove quotes from the
+        // value, and remove any trailing slashes or ">" characters
+        value = value.replace(/^["']/, "")
+                     .replace(/["']\s*[\\\/]?>?\s*$/, "") || "";
+        value = sTrim(value);
+
+        // Don't clobber existing attributes
+        if (!(name in section))
+          section[name] = value;
+      }
+      return section;
+    }
+
+    /**
+     * Returns an array of name-value pair arrays representing the Sherlock
+     * file's input elements. User defined inputs return kUserDefined as the
+     * value. Elements are returned in the order they appear in the source
+     * file.
+     *
+     *   Example:
+     *      <input name="foo" value="bar">
+     *      <input name="foopy" user>
+     *   Returns:
+     *      [["foo", "bar"], ["foopy", "{searchTerms}"]]
+     *
+     * @param aLines
+     *        An array of lines from the source file.
+     */
+    function getInputs(aLines) {
+
+      /**
+       * Extracts an attribute value from a given a line of text.
+       *    Example: <input value="foo" name="bar">
+       *      Extracts the string |foo| or |bar| given an input aAttr of
+       *      |value| or |name|.
+       * Attributes may be quoted or unquoted. If unquoted, any whitespace
+       * indicates the end of the attribute value.
+       *    Example: < value=22 33 name=44\334 >
+       *      Returns |22| for "value" and |44\334| for "name".
+       *
+       * @param aAttr
+       *        The name of the attribute for which to obtain the value. This
+       *        value is not case sensitive.
+       * @param aLine
+       *        The line containing the attribute.
+       *
+       * @returns the attribute value, or an empty string if the attribute
+       *          doesn't exist.
+       */
+      function getAttr(aAttr, aLine) {
+        LOG("_parseAsSherlock::getAttr: Getting attr: \"" +
+            aAttr + "\" for line: \"" + aLine + "\"");
+        // We're not case sensitive, but we want to return the attribute value
+        // in it's original case, so create a copy of the source
+        var lLine = aLine.toLowerCase();
+        var attr = aAttr.toLowerCase();
+
+        var attrStart = lLine.search(new RegExp("\\s" + attr, "i"));
+        if (attrStart == -1) {
+          // If this is the "user defined input" (i.e. contains the empty
+          // "user" attribute), return our special keyword
+          if (kIsUserInput.test(lLine) && attr == "value") {
+            LOG("_parseAsSherlock::getAttr: Found user input!\nLine:\"" + lLine
+                + "\"");
+            return kUserDefined;
+          }
+          // The attribute doesn't exist - ignore
+          LOG("_parseAsSherlock::getAttr: Failed to find attribute:\nLine:\""
+              + lLine + "\"\nAttr:\"" + attr + "\"");
+          return "";
+        }
+
+        var valueStart = lLine.indexOf("=", attrStart) + "=".length;
+        if (valueStart == -1)
+          return "";
+
+        var quoteStart = lLine.indexOf("\"", valueStart);
+        if (quoteStart == -1) {
+
+          // Unquoted attribute, get the rest of the line, trimmed at the first
+          // sign of whitespace. If the rest of the line is only whitespace,
+          // returns a blank string.
+          return lLine.substr(valueStart).replace(/\s.*$/, "");
+
+        } else {
+          // Make sure that there's only whitespace between the start of the
+          // value and the first quote. If there is, end the attribute value at
+          // the first sign of whitespace. This prevents us from falling into
+          // the next attribute if this is an unquoted attribute followed by a
+          // quoted attribute.
+          var betweenEqualAndQuote = lLine.substring(valueStart, quoteStart);
+          if (/\S/.test(betweenEqualAndQuote))
+            return lLine.substr(valueStart).replace(/\s.*$/, "");
+
+          // Adjust the start index to account for the opening quote
+          valueStart = quoteStart + "\"".length;
+          // Find the closing quote
+          valueEnd = lLine.indexOf("\"", valueStart);
+          // If there is no closing quote, just go to the end of the line
+          if (valueEnd == -1)
+            valueEnd = aLine.length;
+        }
+        return aLine.substring(valueStart, valueEnd);
+      }
+
+      var inputs = [];
+
+      LOG("_parseAsSherlock::getInputs: Lines:\n" + aLines);
+      // Filter out everything but non-inputs
+      lines = aLines.filter(function (line) {
+        return /^\s*<input/i.test(line);
+      });
+      LOG("_parseAsSherlock::getInputs: Filtered lines:\n" + lines);
+
+      lines.forEach(function (line) {
+        // Strip leading/trailing whitespace and remove the surrounding markup
+        // ("<input" and ">")
+        line = sTrim(line).replace(/^<input/i, "").replace(/>$/, "");
+
+        // If this is one of the "directional" inputs (<inputnext>/<inputprev>)
+        const directionalInput = /^(prev|next)/i;
+        if (directionalInput.test(line)) {
+
+          // Make it look like a normal input by removing "prev" or "next"
+          line = line.replace(directionalInput, "");
+
+          // If it has a name, give it a dummy value to match previous
+          // nsInternetSearchService behavior
+          if (/name\s*=/i.test(line)) {
+            line += " value=\"0\"";
+          } else
+            return; // Line has no name, skip it
+        }
+
+        var attrName = getAttr("name", line);
+        var attrValue = getAttr("value", line);
+        LOG("_parseAsSherlock::getInputs: Got input:\nName:\"" + attrName +
+            "\"\nValue:\"" + attrValue + "\"");
+        if (attrValue)
+          inputs.push([attrName, attrValue]);
+      });
+      return inputs;
+    }
+
+    function err(aErr) {
+      LOG("_parseAsSherlock::err: Sherlock param error:\n" + aErr);
+      throw Cr.NS_ERROR_FAILURE;
+    }
+
+    var searchSection = getSection(this._data, "search");
+    LOG("_parseAsSherlock: Search section:\n" + searchSection.toSource());
+
+    this._name = searchSection["name"] || err("Missing name!");
+    this._description = searchSection["description"] || "";
+    this._queryCharset = searchSection["querycharset"] ||
+                            getCharSetFromCode(searchSection["queryencoding"]);
+
+    // XXX should this really fall back to GET?
+    var method = (searchSection["method"] || "GET").toUpperCase();
+    var template = searchSection["action"] || err("Missing action!");
+
+    var inputs        = getInputs(this._data);
+    LOG("_parseAsSherlock: Inputs:\n" + inputs.toSource());
+
+    var url = null;
+
+    if (method == "GET") {
+      // Here's how we construct the input string:
+      // <input> is first:  Name Attr:  Prefix      Data           Example:
+      // YES                EMPTY       None        <value>        TEMPLATE<value>
+      // YES                NON-EMPTY   ?           <name>=<value> TEMPLATE?<name>=<value>
+      // NO                 EMPTY       ------------- <ignored> --------------
+      // NO                 NON-EMPTY   &           <name>=<value> TEMPLATE?<n1>=<v1>&<n2>=<v2>
+      for (var i=0; i<inputs.length; i++) {
+        var name  = inputs[i][0];
+        var value = inputs[i][1];
+        if (i==0) {
+          if (name == "")
+            template += kUserDefined;
+          else
+            template += "?" + name + "=" + value;
+        } else if (name != "")
+          template += "&" + name + "=" + value;
+      }
+      url = new EngineURL("text/html", method, template);
+
+    } else if (method == "POST") {
+      // Create the URL object and just add the parameters directly
+      url = new EngineURL("text/html", method, template);
+      for (var i=0; i<inputs.length; i++) {
+        var name  = inputs[i][0];
+        var value = inputs[i][1];
+        if (name)
+          url.addParam(name, value);
+      }
+    } else
+      err("Invalid method!");
+
+    this._urls.push(url);
+  },
+
+  /**
+   * Returns an XML document object containing the search plugin information,
+   * which can later be used to reload the engine.
+   */
+  _serializeToElement: function SRCH_ENG_serializeToEl() {
+    var parser = Cc["@mozilla.org/xmlextras/domparser;1"].
+                 createInstance(Ci.nsIDOMParser);
+
+    var doc = parser.parseFromString(EMPTY_DOC, "text/xml");
+    docElem = doc.documentElement;
+
+    docElem.appendChild(doc.createTextNode("\n"));
+
+    var shortName = doc.createElementNS(kOpenSearchNS_11, "ShortName");
+    shortName.appendChild(doc.createTextNode(this.name));
+    docElem.appendChild(shortName);
+    docElem.appendChild(doc.createTextNode("\n"));
+
+    var description = doc.createElementNS(kOpenSearchNS_11, "Description");
+    description.appendChild(doc.createTextNode(this._description));
+    docElem.appendChild(description);
+    docElem.appendChild(doc.createTextNode("\n"));
+
+    var inputEncoding = doc.createElementNS(kOpenSearchNS_11, "InputEncoding");
+    inputEncoding.appendChild(doc.createTextNode(this._queryCharset));
+    docElem.appendChild(inputEncoding);
+    docElem.appendChild(doc.createTextNode("\n"));
+
+    if (this._iconURI) {
+      var image = doc.createElementNS(kOpenSearchNS_11, "Image");
+      image.appendChild(doc.createTextNode(this.iconURL));
+      image.setAttribute("width", "16");
+      image.setAttribute("height", "16");
+      docElem.appendChild(image);
+      docElem.appendChild(doc.createTextNode("\n"));
+    }
+
+    if (this._alias) {
+      var alias = doc.createElementNS(kMozSearchNS_10, "Alias");
+      alias.appendChild(doc.createTextNode(this.alias));
+      docElem.appendChild(alias);
+      docElem.appendChild(doc.createTextNode("\n"));
+    }
+
+    for (var i = 0; i < this._urls.length; ++i)
+      this._urls[i]._serializeToElement(doc, docElem);
+    docElem.appendChild(doc.createTextNode("\n"));
+
+    return doc;
+  },
+
+  /**
+   * Serializes the engine object to file.
+   */
+  _serializeToFile: function SRCH_ENG_serializeToFile() {
+    var file = this._file;
+    ENSURE_WARN(!this._readOnly, "Can't serialize a read only engine!",
+                Cr.NS_ERROR_FAILURE);
+    ENSURE_WARN(file.exists(), "Can't serialize: file doesn't exist!",
+                Cr.NS_ERROR_UNEXPECTED);
+
+    var fos = Cc["@mozilla.org/network/safe-file-output-stream;1"].
+              createInstance(Ci.nsIFileOutputStream);
+
+    // Serialize the engine first - we don't want to overwrite a good file
+    // if this somehow fails.
+    doc = this._serializeToElement();
+
+    fos.init(file, (MODE_WRONLY | MODE_TRUNCATE), PERMS_FILE, 0);
+
+    try {
+      var serializer = Cc["@mozilla.org/xmlextras/xmlserializer;1"].
+                       createInstance(Ci.nsIDOMSerializer);
+      serializer.serializeToStream(doc.documentElement, fos, null);
+    } catch (e) {
+      LOG("_serializeToFile: Error serializing engine:\n" + e);
+    }
+
+    closeSafeOutputStream(fos);
+  },
+
+  /**
+   * Remove the engine's file from disk. The search service calls this once it
+   * removes the engine from it's internal store. This function will throw if
+   * the file cannot be removed.
+   */
+  _remove: function SRCH_ENG_remove() {
+    ENSURE(!this._readOnly, "Can't remove read only engine!",
+           Cr.NS_ERROR_FAILURE);
+    ENSURE(this._file && this._file.exists(),
+           "Can't remove engine: file doesn't exist!",
+           Cr.NS_ERROR_FILE_NOT_FOUND);
+
+    this._file.remove(false);
+  },
+
+  // nsISearchEngine
+  get alias() {
+    if (this._alias === null)
+      this._alias = getLocalizedPref(this._pref + "alias", "");
+
+    return this._alias;
+  },
+  set alias(val) {
+    this._alias = val;
+    setLocalizedPref(this._pref + "alias", val);
+    notifyAction(this, SEARCH_ENGINE_CHANGED);
+  },
+
+  get description() {
+    return this._description;
+  },
+
+  get hidden() {
+    if (this._hidden === null) {
+      // Initialize the hidden property from a pref
+      this._hidden = getBoolPref(this._pref + "hidden", false);
+    }
+    return this._hidden;
+  },
+  set hidden(val) {
+    var value = !!val;
+    if (value != this._hidden) {
+      setBoolPref(this._pref + "hidden", value);
+      this._hidden = value;
+      notifyAction(this, SEARCH_ENGINE_CHANGED);
+    }
+  },
+
+  get iconURI() {
+    return this._iconURI;
+  },
+
+  // Where the engine is being loaded from: will return the URI's spec if the
+  // engine is being downloaded and does not yet have a file. This is only used
+  // for logging.
+  get _location() {
+    if (this._file)
+      return this._file.path;
+
+    if (this._uri)
+      return this._uri.spec;
+
+    return "";
+  },
+
+  get name() {
+    return this._name;
+  },
+
+  get type() {
+    return this._type;
+  },
+
+  get searchForm() {
+    // XXX OpenSearch has a searchForm attribute, should use it instead of this
+    // ugly ugly hack
+    return makeURI("http://" + makeURI(this._urls[0].template).host).spec;
+  },
+
+  get queryCharset() {
+    if (this._queryCharset)
+      return this._queryCharset;
+    return this._queryCharset = getCharSetFromCode(/* get the default */);
+  },
+
+  addParam: function SRCH_ENG_addParam(aName, aValue) {
+    ENSURE_ARG(aName && aValue,
+               "missing name or value for nsISearchEngine::addParam!");
+    ENSURE_WARN(!this._readOnly,
+                "called nsISearchEngine::addParam on a read-only engine!",
+                Cr.NS_ERROR_FAILURE);
+
+    this._urls[0].addParam(aName, aValue);
+  },
+
+  getSubmission: function SRCH_ENG_getSubmission(aData) {
+    ENSURE_WARN(this._urls[0], "engine object has no URL!",
+                Cr.NS_ERROR_UNEXPECTED);
+
+    LOG("getSubmission: In data: \"" + aData + "\"");
+    var textToSubURI = Cc["@mozilla.org/intl/texttosuburi;1"].
+                       getService(Ci.nsITextToSubURI);
+    var data = "";
+    try {
+      data = textToSubURI.ConvertAndEscape(this.queryCharset, aData);
+    } catch (ex) {
+      LOG("getSubmission: Falling back to default queryCharset!");
+      data = textToSubURI.ConvertAndEscape(DEFAULT_QUERY_CHARSET, aData);
+    }
+    LOG("getSubmission: Out data: \"" + data + "\"");
+    return this._urls[0].getSubmission(data); //XXX only support one URL?
+  },
+
+  // nsISupports
+  QueryInterface: function SRCH_ENG_QI(aIID) {
+    if (aIID.equals(Ci.nsISearchEngine) ||
+        aIID.equals(Ci.nsISupports))
+      return this;
+    throw Cr.NS_ERROR_NO_INTERFACE;
+  },
+
+  get wrappedJSObject() {
+    return this;
+  }
+
+};
+
+// nsISearchSubmission
+function Submission(aURI, aPostData) {
+  this._uri = aURI;
+  this._postData = aPostData;
+}
+Submission.prototype = {
+  get uri() {
+    return this._uri;
+  },
+  get postData() {
+    return this._postData;
+  },
+  QueryInterface: function SRCH_SUBM_QI(aIID) {
+    if (aIID.equals(Ci.nsISearchSubmission) ||
+        aIID.equals(Ci.nsISupports))
+      return this;
+    throw Cr.NS_ERROR_NO_INTERFACE;
+  }
+}
+
+// nsIBrowserSearchService
+function SearchService() {
+  this._init();
+}
+SearchService.prototype = {
+  _engines: { },
+
+  _init: function() {
+    this._addObservers();
+
+    var fileLocator = Cc["@mozilla.org/file/directory_service;1"].
+                      getService(Ci.nsIProperties);
+    var locations = fileLocator.get(NS_APP_SEARCH_DIR_LIST,
+                                    Ci.nsISimpleEnumerator);
+
+    while (locations.hasMoreElements()) {
+      var location = locations.getNext().QueryInterface(Ci.nsIFile);
+      this._loadEngines(location);
+    }
+
+    selectedEngineName = getLocalizedPref(BROWSER_SEARCH_PREF +
+                                          "selectedEngine");
+    this._currentEngine = this.getEngineByName(selectedEngineName) ||
+                          this.defaultEngine;
+  },
+
+  _addEngineToStore: function SRCH_SVC_addEngineToStore(aEngine) {
+    LOG("_addEngineToStore: Adding engine: \"" + aEngine.name + "\"");
+    // XXX Prefer XML files?
+    if (aEngine.name in this._engines) {
+      LOG("_addEngineToStore: Duplicate engine found, aborting!");
+      return;
+      // XXX handle duplicates better?
+      // might want to prompt the user in the case where the engine is being
+      // added through a user action
+    }
+    this._engines[aEngine.name] = aEngine;
+    notifyAction(aEngine, SEARCH_ENGINE_ADDED);
+  },
+
+  _loadEngines: function SRCH_SVC_loadEngines(aDir) {
+    LOG("_loadEngines: Searching in " + aDir.path + " for search engines.");
+
+    ENSURE_WARN(aDir.exists(),
+                "Can't loadEngines from " + aDir.path + ", it doesn't exist!",
+                Cr.NS_ERROR_FAILURE);
+
+    // Check whether aDir is the user profile dir
+    var isInProfile = aDir.equals(getDir(NS_APP_USER_SEARCH_DIR));
+
+    var files = aDir.directoryEntries;
+    var ios = Cc["@mozilla.org/network/io-service;1"].
+              getService(Ci.nsIIOService);
+
+    while (files.hasMoreElements()) {
+      var file = files.getNext().QueryInterface(Ci.nsILocalFile);
+
+      // Ignore hidden and empty files, and directories
+      if (!file.isFile() || file.isHidden() || file.fileSize == 0)
+        continue;
+
+      var fileURL = ios.newFileURI(file).QueryInterface(Ci.nsIURL);
+      var fileExtension = fileURL.fileExtension.toLowerCase();
+      var isWritable = isInProfile && file.isWritable();
+      var addedEngine = null;
+
+      LOG("_loadEngines: Looking at file: \"" + fileURL.fileName + "\"");
+      try {
+        switch (fileExtension) {
+          case XML_FILE_EXT:
+            // Create a new engine object, readonly if it's not in the profile
+            addedEngine = new Engine(file, Ci.nsISearchEngine.DATA_XML,
+                                     !isWritable);
+            LOG("_loadEngines: Done loading engine: " + fileURL.fileName);
+            this._addEngineToStore(addedEngine);
+            break;
+          case SHERLOCK_FILE_EXT:
+            addedEngine = new Engine(file, Ci.nsISearchEngine.DATA_TEXT,
+                                     !isWritable);
+            if (isInProfile && file.isWritable()) {
+              // Convert engines in the profile to the new format
+              try {
+                this._convertSherlockFile(addedEngine, fileURL.fileBaseName);
+              } catch (ex) {
+                // If the engine couldn't be converted, mark it as read-only
+                addedEngine._readOnly = true;
+              }
+            } else {
+              // Try to find the engine's icon
+              var icon = this._findSherlockIcon(file, fileURL.fileBaseName);
+              if (icon)
+                addedEngine._iconURI = ios.newFileURI(icon);
+            }
+            this._addEngineToStore(addedEngine);
+            break;
+          default:
+            // Not an engine...
+            continue;
+        }
+      } catch (e) {
+        // skip...
+        LOG("_loadEngines: Failed to load search engine: \"" + fileURL.fileName
+            + "\". " + e);
+      }
+    }
+  },
+
+  /**
+   * Converts a Sherlock file and it's icon into the custom XML format used by
+   * the Search Service. Saves the engine's icon (if present) into the XML as a
+   * data: URI and changes the extension of the source file from ".src" to
+   * ".xml". The engine data is then written to the file as XML.
+   * @param aEngine
+   *        The Engine object that needs to be converted.
+   * @param aBaseName
+   *        The basename of the Sherlock file.
+   *          Example: "foo" for file "foo.src".
+   * @see nsIURL::fileBaseName
+   */
+  _convertSherlockFile: function SRCH_SVC_convertSherlock(aEngine, aBaseName) {
+    // See if it has a corresponding icon
+    try {
+      var icon = this._findSherlockIcon(aEngine._file, aBaseName);
+      if (icon && icon.fileSize < MAX_ICON_SIZE) {
+        // Use this as the engine's icon
+        var bStream = Cc["@mozilla.org/binaryinputstream;1"].
+                        createInstance(Ci.nsIBinaryInputStream);
+        var fileInStream = Cc["@mozilla.org/network/file-input-stream;1"].
+                           createInstance(Ci.nsIFileInputStream);
+
+        fileInStream.init(icon, MODE_RDONLY, PERMS_FILE, 0);
+        bStream.setInputStream(fileInStream);
+
+        var bytes = [];
+        while (bStream.available() != 0)
+          bytes = bytes.concat(bStream.readByteArray(bStream.available()));
+        bStream.close();
+
+        // Convert the byte array to a base64-encoded string
+        var str = b64(bytes);
+
+        aEngine._iconURI = makeURI(ICON_DATAURL_PREFIX + str);
+        LOG("_importSherlockEngine: Set sherlock iconURI to: \"" +
+            aEngine.iconURL + "\"");
+
+        // Delete the icon
+        icon.remove(false);
+      }
+    } catch (ex) { LOG("_convertSherlockFile: Error setting icon: " + ex); }
+
+    var oldFile = aEngine._file;
+
+    // Back up the old file
+    try {
+      var backupDir = oldFile.parent;
+      backupDir.append("searchplugins-backup");
+      if (!backupDir.exists())
+        backupDir.create(Ci.nsIFile.DIRECTORY_TYPE, PERMS_DIRECTORY);
+
+      oldFile.copyTo(backupDir, null);
+    } catch (ex) {
+      // Just bail. Engines that can't be backed up won't be converted, but
+      // engines that aren't converted are loaded as readonly.
+      LOG("_convertSherlockFile: Couldn't back up " + oldFile.path + ".");
+      return;
+    }
+
+    // Rename the file, but don't clobber existing files
+    var newFile = oldFile.parent.clone();
+    newFile.append(aBaseName + "." + XML_FILE_EXT);
+
+    if (!newFile.exists())
+      oldFile.moveTo(null, aBaseName + "." + XML_FILE_EXT);
+    else {
+      newFile.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, PERMS_FILE);
+      oldFile.moveTo(null, newFile.leafName);
+    }
+
+    // Write the converted engine to disk
+    aEngine._serializeToFile();
+  },
+
+  /**
+   * Finds an icon associated to a given Sherlock file. Searches the provided
+   * file's parent directory looking for files with the same base name and one
+   * of the file extensions in SHERLOCK_ICON_EXTENSIONS.
+   * @param aEngineFile
+   *        The Sherlock plugin file.
+   * @param aBaseName
+   *        The basename of the Sherlock file.
+   *          Example: "foo" for file "foo.src".
+   * @see nsIURL::fileBaseName
+   */
+  _findSherlockIcon: function SRCH_SVC_findSherlock(aEngineFile, aBaseName) {
+    for (var i=0; i<SHERLOCK_ICON_EXTENSIONS.length; i++) {
+      var icon = aEngineFile.parent.clone();
+      icon.append(aBaseName + SHERLOCK_ICON_EXTENSIONS[i]);
+      if (icon.exists() && icon.isFile())
+        return icon;
+    }
+  },
+
+  /**
+   * Get a sorted array of engines.
+   * @param aWithHidden
+   *        True if hidden plugins should be included in the result.
+   */
+  _getSortedEngines: function SRCH_SVC_getSorted(aWithHidden) {
+    var engines = [];
+    var addedEngines = { };
+    var engineName, engine;
+    var i = 0;
+
+    while (true) {
+      engineName = getLocalizedPref(BROWSER_SEARCH_PREF + "order." + (++i));
+      if (!engineName)
+        break;
+
+      engine = this._engines[engineName];
+      if (engine && !(engineName in addedEngines) &&
+          (aWithHidden || !engine.hidden)) {
+        engines.push(engine);
+        addedEngines[engineName] = engine;
+      }
+    }
+
+    // No more sorted engines
+    for (engineName in this._engines) {
+      engine = this._engines[engineName];
+      if (!(engineName in addedEngines) && (aWithHidden || !engine.hidden))
+        engines.push(this._engines[engineName]);
+    }
+    return engines;
+  },
+
+  getEngines: function SRCH_SVC_getEngines(aCount) {
+    LOG("getEngines: getting all engines");
+    var engines = this._getSortedEngines(true);
+    aCount.value = engines.length;
+    return engines;
+  },
+
+  getVisibleEngines: function SRCH_SVC_getVisible(aCount) {
+    LOG("getVisibleEngines: getting all visible engines");
+    var engines = this._getSortedEngines(false);
+    aCount.value = engines.length;
+    return engines;
+  },
+
+  getEngineByName: function SRCH_SVC_getEngineByName(aEngineName) {
+    return this._engines[aEngineName] || null;
+  },
+
+  getEngineByAlias: function SRCH_SVC_getEngineByAlias(aAlias) {
+    for (var engineName in this._engines) {
+      var engine = this._engines[engineName];
+      if (engine && engine.alias == aAlias)
+        return engine;
+    }
+    return null;
+  },
+
+  addEngineWithDetails: function SRCH_SVC_addEWD(aName, aIconURL, aAlias,
+                                                 aDescription, aMethod,
+                                                 aTemplate) {
+    ENSURE_ARG(aName, "Invalid name passed to addEngineWithDetails!");
+    ENSURE_ARG(aMethod, "Invalid method passed to addEngineWithDetails!");
+    ENSURE_ARG(aTemplate, "Invalid template passed to addEngineWithDetails!");
+
+    ENSURE(!this._engines[aName], "An engine with that name already exists!",
+           Cr.NS_ERROR_FILE_ALREADY_EXISTS);
+
+    var engine = new Engine(getSanitizedFile(aName),
+                            Ci.nsISearchEngine.DATA_XML, false);
+    engine._initFromMetadata(aName, aIconURL, aAlias, aDescription,
+                             aMethod, aTemplate);
+    this._addEngineToStore(engine);
+  },
+
+  addEngine: function SRCH_SVC_addEngine(aEngineURL, aType, aIconURL) {
+    LOG("addEngine: Adding \"" + aEngineURL + "\".");
+    try {
+      var engine = new Engine(makeURI(aEngineURL), aType, false);
+    } catch (ex) {
+      LOG("addEngine: Error adding engine:\n" + ex);
+      throw Cr.NS_ERROR_FAILURE;
+    }
+    engine._setIcon(aIconURL);
+  },
+
+  removeEngine: function SRCH_SVC_removeEngine (aEngine) {
+    ENSURE_ARG(aEngine, "no engine passed to removeEngine!");
+
+    var engineToRemove = null;
+    for (var e in this._engines)
+      if (aEngine.wrappedJSObject == this._engines[e])
+        engineToRemove = this._engines[e];
+
+    ENSURE(engineToRemove, "removeEngine: Can't find engine to remove!",
+           Cr.NS_ERROR_FILE_NOT_FOUND);
+
+    if (engineToRemove == this.currentEngine)
+      this.currentEngine = this.defaultEngine;
+
+    if (engineToRemove._readOnly) {
+      // Just hide it (the "hidden" setter will notify)
+      engineToRemove.hidden = true;
+    } else {
+      // Remove the engine file from disk (this might throw)
+      engineToRemove._remove();
+      // Remove the engine from the internal store
+      delete this._engines[engineToRemove.name];
+      notifyAction(engineToRemove, SEARCH_ENGINE_REMOVED);
+    }
+  },
+
+  get defaultEngine() {
+    const defPref = BROWSER_SEARCH_PREF + "defaultenginename";
+    // Get the default engine - this pref should always exist, but the engine
+    // might be hidden
+    this._defaultEngine = this.getEngineByName(getLocalizedPref(defPref, ""));
+    if (!this._defaultEngine || this._defaultEngine.hidden)
+      this._defaultEngine = this.getVisibleEngines({})[0] || null;
+    return this._defaultEngine;
+  },
+
+  get currentEngine() {
+    if (this._currentEngine.hidden)
+      this._currentEngine = this.defaultEngine;
+    return this._currentEngine;
+  },
+  set currentEngine(val) {
+    ENSURE_ARG(val.QueryInterface(Ci.nsISearchEngine),
+               "Invalid argument passed to currentEngine setter");
+
+    this._currentEngine = this.getEngineByName(val.name) || this.defaultEngine;
+    setLocalizedPref(BROWSER_SEARCH_PREF + "selectedEngine",
+                     this._currentEngine.name);
+    notifyAction(this._currentEngine, SEARCH_ENGINE_CURRENT);
+  },
+
+  // nsIObserver
+  observe: function SRCH_SVC_observe(aEngine, aTopic, aVerb) {
+    switch (aTopic) {
+      case SEARCH_ENGINE_TOPIC:
+        if (aVerb == SEARCH_ENGINE_LOADED) {
+          var engine = aEngine.QueryInterface(Ci.nsISearchEngine);
+          LOG("nsISearchEngine::observe: Done installation of " + engine.name
+              + ".");
+          this._addEngineToStore(engine.wrappedJSObject);
+        }
+        break;
+      case XPCOM_SHUTDOWN_TOPIC:
+        this._removeObservers();
+        break;
+    }
+  },
+
+  _addObservers: function SRCH_SVC_addObservers() {
+    var os = Cc["@mozilla.org/observer-service;1"].
+             getService(Ci.nsIObserverService);
+    os.addObserver(this, SEARCH_ENGINE_TOPIC, false);
+    os.addObserver(this, XPCOM_SHUTDOWN_TOPIC, false);
+  },
+
+  _removeObservers: function SRCH_SVC_removeObservers() {
+    var os = Cc["@mozilla.org/observer-service;1"].
+             getService(Ci.nsIObserverService);
+    os.removeObserver(this, SEARCH_ENGINE_TOPIC);
+    os.removeObserver(this, XPCOM_SHUTDOWN_TOPIC);
+  },
+
+  QueryInterface: function SRCH_SVC_QI(aIID) {
+    if (aIID.equals(Ci.nsIBrowserSearchService) ||
+        aIID.equals(Ci.nsIObserver)             ||
+        aIID.equals(Ci.nsISupports))
+      return this;
+    throw Cr.NS_ERROR_NO_INTERFACE;
+  }
+};
+
+var gModule = {
+  _classID: Components.ID("{7319788a-fe93-4db3-9f39-818cf08f4256}"),
+  _className: "Browser Search Service",
+  _contractID: "@mozilla.org/browser/search-service;1",
+
+  registerSelf: function (componentManager, fileSpec, location, type) {
+    componentManager.QueryInterface(Ci.nsIComponentRegistrar);
+    componentManager.registerFactoryLocation(this._classID,
+                                             this._className,
+                                             this._contractID,
+                                             fileSpec, location, type);
+  },
+
+  getClassObject: function (componentManager, cid, iid) {
+    if (!iid.equals(Ci.nsIFactory))
+      throw Cr.NS_ERROR_NOT_IMPLEMENTED;
+    return this;
+  },
+
+  createInstance: function (outer, iid) {
+    if (outer != null)
+      throw Cr.NS_ERROR_NO_AGGREGATION;
+    return (new SearchService()).QueryInterface(iid);
+  },
+
+  canUnload: function (componentManager) {
+    return true;
+  }
+};
+
+function NSGetModule(componentManager, fileSpec) {
+  return gModule;
+}
diff --git a/browser/components/sidebar/src/nsSidebar.js b/browser/components/sidebar/src/nsSidebar.js
index 3e6601f3387..f12d9841fb7 100644
--- a/browser/components/sidebar/src/nsSidebar.js
+++ b/browser/components/sidebar/src/nsSidebar.js
@@ -128,6 +128,7 @@ function (engineURL, iconURL, suggestedTitle, suggestedCategory)
     debug("addSearchEngine(" + engineURL + ", " + iconURL + ", " +
           suggestedCategory + ", " + suggestedTitle + ")");
 
+    // XXXBug 312560: Localize me!
     try
     {
         // make sure using HTTP or HTTPS and refering to a .src file
@@ -154,7 +155,6 @@ function (engineURL, iconURL, suggestedTitle, suggestedCategory)
             titleMessage = stringBundle.GetStringFromName("addEngineConfirmTitle");
             dialogMessage = stringBundle.GetStringFromName("addEngineConfirmMessage");
             dialogMessage = dialogMessage.replace(/%title%/, suggestedTitle);
-            dialogMessage = dialogMessage.replace(/%category%/, suggestedCategory);
             dialogMessage = dialogMessage.replace(/%url%/, engineURL);
             dialogMessage = dialogMessage.replace(/#/g, "\n");
         }
@@ -162,7 +162,6 @@ function (engineURL, iconURL, suggestedTitle, suggestedCategory)
     catch (e) {
         titleMessage = "Add Search Engine";
         dialogMessage = "Add the following search engine?\n\nName: " + suggestedTitle;
-        dialogMessage += "\nSearch Category: " + suggestedCategory;
         dialogMessage += "\nSource: " + engineURL;
     }
           
@@ -171,14 +170,11 @@ function (engineURL, iconURL, suggestedTitle, suggestedCategory)
     if (!rv)
         return;
 
-    var internetSearch = Components.classes[NETSEARCH_CONTRACTID].getService();
-    if (internetSearch)    
-        internetSearch = internetSearch.QueryInterface(nsIInternetSearchService);
-    if (internetSearch)
-    {
-        internetSearch.AddSearchEngine(engineURL, iconURL, suggestedTitle,
-                                       suggestedCategory);
-    }
+    var searchService = Components.classes["@mozilla.org/browser/search-service;1"]
+                                  .getService(Components.interfaces.nsIBrowserSearchService);
+    const typeText = Components.interfaces.nsISearchEngine.DATA_TEXT;
+    if (searchService)
+      searchService.addEngine(engineURL, typeText, iconURL);
 }
 
 // property of nsIClassInfo
diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in
index c13fa3e680f..8cbcf045d41 100644
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -23,6 +23,18 @@ extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}/install.rdf
 extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}/
 searchplugins/dictionary.src
 searchplugins/dictionary.png
+searchplugins/amazondotcom.src
+searchplugins/amazondotcom.png
+searchplugins/creativecommons.src
+searchplugins/creativecommons.png
+searchplugins/answers.src
+searchplugins/answers.png
+searchplugins/eBay.src
+searchplugins/eBay.gif
+searchplugins/google.src
+searchplugins/google.gif
+searchplugins/yahoo.src
+searchplugins/yahoo.gif
 searchplugins/
 components/component.reg
 components/compreg.dat
diff --git a/browser/installer/unix/packages-static b/browser/installer/unix/packages-static
index 71fa279ee49..5dc8da2fecf 100644
--- a/browser/installer/unix/packages-static
+++ b/browser/installer/unix/packages-static
@@ -58,6 +58,7 @@ bin/components/autocomplete.xpt
 bin/components/autoconfig.xpt
 bin/components/bookmarks.xpt
 bin/components/browsercompsbase.xpt
+bin/components/browsersearch.xpt
 bin/components/caps.xpt
 bin/components/chardet.xpt
 bin/components/chrome.xpt
@@ -178,6 +179,7 @@ bin/components/shellservice.xpt
 bin/components/nsBrowserContentHandler.js
 bin/components/nsBrowserGlue.js
 bin/components/nsSetDefaultBrowser.js
+bin/components/nsSearchService.js
 bin/components/jsconsole-clhandler.js
 bin/components/nsCloseAllWindows.js
 bin/components/nsDictionary.js
diff --git a/browser/installer/windows/packages-static b/browser/installer/windows/packages-static
index c66b43d04f1..573196050e1 100644
--- a/browser/installer/windows/packages-static
+++ b/browser/installer/windows/packages-static
@@ -62,6 +62,7 @@ bin\components\autocomplete.xpt
 bin\components\autoconfig.xpt
 bin\components\bookmarks.xpt
 bin\components\browsercompsbase.xpt
+bin\components\browsersearch.xpt
 bin\components\caps.xpt
 bin\components\chardet.xpt
 bin\components\chrome.xpt
@@ -194,6 +195,7 @@ bin\components\nsCloseAllWindows.js
 bin\components\nsDictionary.js
 bin\components\nsHelperAppDlg.js
 bin\components\nsProxyAutoConfig.js
+bin\components\nsSearchService.js
 bin\components\nsSidebar.js
 bin\components\nsXmlRpcClient.js
 bin\components\nsExtensionManager.js
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index 2ad4e8e52bc..de896807730 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -125,10 +125,10 @@ install:: $(addprefix $(LOCALE_SRCDIR)/profile/chrome/,$(PROFILE_CHROME))
 SEARCH_PLUGINS = $(shell cat $(LOCALE_SRCDIR)/searchplugins/list.txt)
 SEARCH_PLUGIN_PREFIX = $(addprefix $(LOCALE_SRCDIR)/searchplugins/,$(SEARCH_PLUGINS))
 
-libs:: $(addsuffix .src,$(SEARCH_PLUGIN_PREFIX)) $(foreach base,$(SEARCH_PLUGIN_PREFIX),$(wildcard $(base).gif)$(wildcard $(base).png))
+libs:: $(addsuffix .xml,$(SEARCH_PLUGIN_PREFIX)) $(foreach base,$(SEARCH_PLUGIN_PREFIX),$(wildcard $(base).gif)$(wildcard $(base).png))
 	$(INSTALL) $^ $(FINAL_TARGET)/searchplugins
 
-install:: $(addsuffix .src,$(SEARCH_PLUGIN_PREFIX)) $(foreach base,$(SEARCH_PLUGIN_PREFIX),$(wildcard $(base).gif)$(wildcard $(base).png))
+install:: $(addsuffix .xml,$(SEARCH_PLUGIN_PREFIX)) $(foreach base,$(SEARCH_PLUGIN_PREFIX),$(wildcard $(base).gif)$(wildcard $(base).png))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
 
 libs-%:
diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
index 45790979b03..e59e74bcc43 100644
--- a/browser/locales/en-US/chrome/browser-region/region.properties
+++ b/browser/locales/en-US/chrome/browser-region/region.properties
@@ -10,14 +10,14 @@ browser.startup.homepage=http://start.mozilla.org/firefox
 browser.throbber.url=http://www.mozilla.org/products/firefox/central.html
 browser.search.defaulturl=http://www.google.com/search?lr=&ie=UTF-8&oe=UTF-8&q=
 
+# Search engine order (order displayed in the search bar dropdown)s
 browser.search.order.1=Google
 browser.search.order.2=Yahoo
 
 #config.js
 startup.homepage_override_url=http://www.mozilla.org/products/firefox/releases/whatsnew/
 
-# search-panel.properties
-defaultSearchURL=http://www.google.com/search?hl=en&lr=&ie=UTF-8&oe=UTF-8&q=
+# Default search engine
 browser.search.defaultenginename=Google
 
 # update notifications: new update page
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index e2671a16068..af7b5ad646b 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -29,7 +29,7 @@ showskinsdescription=true
 
 # context menu strings
 
-searchText=Search Web for "%S"
+contextMenuSearchText=Search %S for "%S"
 
 blockImages=Block Images from %S
 
diff --git a/browser/locales/en-US/chrome/browser/search.properties b/browser/locales/en-US/chrome/browser/search.properties
new file mode 100755
index 00000000000..f19085a04e3
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/search.properties
@@ -0,0 +1,15 @@
+searchtip=Search %S
+cmd_addEngine=Add Engines...
+cmd_addEngine_accesskey=A
+cmd_clearHistory=Clear Search History
+cmd_clearHistory_accesskey=C
+cmd_editList=Edit this list...
+cmd_editListAccesskey=E
+error_loading_engine_title=Download Error
+error_loading_engine_msg=%S could not download the search plugin from:\n%S\n\nPlease try again or contact the author.
+remove_engine_title=Remove Engine?
+remove_engine_msg=If you remove '%S' you will not be able to search using it from the Search Box any more. Are you sure you want to remove it?
+edit_name_title=Edit Name
+edit_name_msg=Enter a new Name:
+edit_alias_title=Edit Alias
+edit_alias_msg=Enter a new Alias:
diff --git a/browser/locales/en-US/chrome/browser/searchDialog.dtd b/browser/locales/en-US/chrome/browser/searchDialog.dtd
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/locales/en-US/chrome/browser/searchbar.properties b/browser/locales/en-US/chrome/browser/searchbar.properties
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/locales/en-US/chrome/browser/sidebar/sidebar.properties b/browser/locales/en-US/chrome/browser/sidebar/sidebar.properties
index 3363bafeb20..760f1533795 100644
--- a/browser/locales/en-US/chrome/browser/sidebar/sidebar.properties
+++ b/browser/locales/en-US/chrome/browser/sidebar/sidebar.properties
@@ -1,2 +1,2 @@
 addEngineConfirmTitle=Add Search Engine
-addEngineConfirmMessage=Add the following search engine to the Search Bar?##Name: %title%#Search Category: %category%#Source: %url%
+addEngineConfirmMessage=Add the following search engine to the Search Bar?##Name: %title%#Source: %url%
diff --git a/browser/locales/en-US/searchplugins/amazondotcom.png b/browser/locales/en-US/searchplugins/amazondotcom.png
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/browser/locales/en-US/searchplugins/amazondotcom.src b/browser/locales/en-US/searchplugins/amazondotcom.src
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/browser/locales/en-US/searchplugins/amazondotcom.xml b/browser/locales/en-US/searchplugins/amazondotcom.xml
new file mode 100755
index 00000000000..29395af675b
--- /dev/null
+++ b/browser/locales/en-US/searchplugins/amazondotcom.xml
@@ -0,0 +1,12 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearchdescription/1.1/">
+<os:ShortName>Amazon.com</os:ShortName>
+<os:Description>Amazon.com Search</os:Description>
+<os:InputEncoding>ISO-8859-1</os:InputEncoding>
+<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsQAAALEAGtI711AAAAB3RJTUUH0wESEi0MqTATXwAAAjVJREFUeJyFUlGLElEU/mbVHd2aaaRgWGyJgmXRINiXfJCeRgaiLEiKgYXoRQrqRejNH7D1uNBDPvbWtGxvS64IG2IIQQhxScpYMpt1l1qdptVVZ+z2oM6qu9KBC4dzv/Od73z3AmPROmjeVlWVKopCRVGkHMdRURSpoig0lUrRcfxI6LoelWV5GwCddOLx+PEklmVej0QiI80Oh4OyLHuE5Fgl/aJ9gsEgzefzm4SQzVgs9n8VqqqO7EwIsUGEkEscx9kEsizbd85BEo3eenzzRkRstTsfAVwRBOH+EP/DSb4x4wVN0wq5XE7MZDKz5XIZlUoFtVoNu7u7NkaWZaTTaWZEQV8qDYfDKBaLkwZOVkAI8UuS9GkwiWVZNBr7sLZeo1V6hb/GFrxGwW6s84twzYbgGBRM0/yZzWZtQCKRQGhuD80PT0DbdUzxF9DmA2jzAbiNIjztHUzvvT+UIoqi7TLHcVTX9QeWZVLLMikh5Nzwf2h9USlNgtIk6NSAoNlsYjgXBOG50+liAGCe3/72ayOGP28f9fZ2ewEAv89GYRMEAgGboNvtYjBtf0PB9BsZJz8/Q7dR7d3Xeia75+/0XsGyTEqNrzC/p9HVSzCr7w4N+7GGOr+IE6GnOH3+KgCgo2XhAeCak+DU16PUWL0Mr1EYfdO+027/PZxaWIKJmY4kSaX1lysXnat+HARXMOM5wzA0iSP/etDILixhp9aGz+djAEDTtLt8aflFt1GFcG2NAYB/rN8dqx12fbIAAAAASUVORK5CYII=</os:Image>
+<os:Url type="text/html" method="GET" template="http://www.amazon.com/exec/obidos/external-search/">
+  <os:Param name="field-keywords" value="{searchTerms}"/>
+  <os:Param name="mode" value="blended"/>
+  <os:Param name="tag" value="mozilla-20"/>
+  <os:Param name="sourceid" value="Mozilla-search"/>
+</os:Url>
+</SearchPlugin>
diff --git a/browser/locales/en-US/searchplugins/answers.png b/browser/locales/en-US/searchplugins/answers.png
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/browser/locales/en-US/searchplugins/answers.src b/browser/locales/en-US/searchplugins/answers.src
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/locales/en-US/searchplugins/answers.xml b/browser/locales/en-US/searchplugins/answers.xml
new file mode 100755
index 00000000000..defa31c48df
--- /dev/null
+++ b/browser/locales/en-US/searchplugins/answers.xml
@@ -0,0 +1,10 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearchdescription/1.1/">
+<os:ShortName>Answers.com</os:ShortName>
+<os:Description>Dictionary Search on Answers.com</os:Description>
+<os:InputEncoding>UTF-8</os:InputEncoding>
+<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////K////4f////E////5f///+n////P////mv///0EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8E////fv///+//////////////////////7NnP/+LFtv/////+////of///xYAAAAAAAAAAAAAAAD///8D////lf////////////j0//bi1v/OlXf/tGU9/6FCEv/OmH3////////////////D////FgAAAAAAAAAA////avPm4P/evaz/8NbI//7r3//23M3/xYRi/5kzAP/Df1z//u/l//749P/v4dn/+PPw/////6j///8B////GP///+W/f1//smM7//bczf/+69///uvf/9ytlP+ZMwD/5se3/+/f1//AgmP/nj0N/927qv/////+////QP///2z/////8NvQ/8WCYP/+69///uvf//7r3/+7ckz/pUkb/9m1ov+ePQ3/okUW/8+fh//38O3//////////5r///+t//////7y6v/Cflv/58Cr//DRwP/mwKv/okQU/8ODYv/cuqj/yZN4//Tq5f/+9e///vDn///////////Q////yf/////+7+b/05yA/65ZLv+9dVD/sF40/5kzAP/kvKb//vTu//Tr5v/7+Pb//vfz//707f//////////6f///8X//////vDm/+K4ov/KjGz//ure/8uNbf+jRBX/+OTX/+3b0v+jSBr/pk0h/717Wv/Wrpr//Pn4/////+b///+i//////7z7f/02Mj/wn5b//vl2P+uWS7/vXhU//v49//48u//1q6a/717Wv+oUSb/tWxH//jz8P/////K////V///////+/j//ure/8aFZP/fs5v/oEAQ/9q1o/+zaEL/1ayX//718P/+9/P/+PHu//jz8P//////////h////wr////O///////38v/YpYr/tGQ7/6ZLHf/06eX/s2dB/549Df/x49z//vDn//7x6f//////////8////yoAAAAA////R/////v/////7dXI/5kzAP+7cUv//vHp/+vYzv+bNwX/vHlY//38/P///////////////30AAAAAAAAAAAAAAAD///9n////+/z5+P++e1n/3LGc//7w5//++PT/0KKL/8OIa//9/Pv//////////5X///8GAAAAAAAAAAAAAAAAAAAAAP///0n////K///////////////////////////+/v7/////5v///2z///8CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Cv///1f///+g////xP///8n///+r////bP///xoAAAAAAAAAAAAAAAAAAAAA+B////AH///AA///wAH//4AB//+AAP//AAD//wAA//8AAP//AAD//4AA//+AAf//wAP//+AD///wD////D///w==</os:Image>
+<os:Url type="text/html" method="GET" template="http://www.answers.com/main/ntquery">
+  <os:Param name="s" value="{searchTerms}"/>
+  <os:Param name="gwp" value="13"/>
+</os:Url>
+</SearchPlugin>
diff --git a/browser/locales/en-US/searchplugins/creativecommons.png b/browser/locales/en-US/searchplugins/creativecommons.png
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/locales/en-US/searchplugins/creativecommons.src b/browser/locales/en-US/searchplugins/creativecommons.src
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/locales/en-US/searchplugins/creativecommons.xml b/browser/locales/en-US/searchplugins/creativecommons.xml
new file mode 100755
index 00000000000..a60c7dd2652
--- /dev/null
+++ b/browser/locales/en-US/searchplugins/creativecommons.xml
@@ -0,0 +1,10 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearchdescription/1.1/">
+<os:ShortName>Creative Commons</os:ShortName>
+<os:Description>Find photos, movies, music, and text to rip, sample, mash, and share.</os:Description>
+<os:InputEncoding>utf-8</os:InputEncoding>
+<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAA2UExURf///wAAAD8/P+/v7y8vL19fX9/f37+/vw8PD8/Pz09PT5+fn4+Pj6+vr29vbx8fH39/f////3TGU44AAAASdFJOU///////////////////////AOK/vxIAAACWSURBVHjaNI8LEsQgCEMJIvi3vf9lN3bbN6MD0USUm3QFaVNYc7kBuvLZ0xG8oLkQV1iiYBjyktFE+tk+FCEGl3oFT0aSQBaoVDAmAyWkmOCitVfHTvV4BEsWxqyleE+PYLQAi5b9WJShPnh7MnQytDP1IxmfvZXq22dkTkpZ4/TT/qPfiX/dqoXJz+dItE0tx6l/AgwA0e4FeJjn5bsAAAAASUVORK5CYII=</os:Image>
+<os:Url type="text/html" method="GET" template="http://search.creativecommons.org/">
+  <os:Param name="q" value="{searchTerms}"/>
+  <os:Param name="sourceid" value="Mozilla-search"/>
+</os:Url>
+</SearchPlugin>
diff --git a/browser/locales/en-US/searchplugins/dictionary.src b/browser/locales/en-US/searchplugins/dictionary.src
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/browser/locales/en-US/searchplugins/eBay.gif b/browser/locales/en-US/searchplugins/eBay.gif
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/browser/locales/en-US/searchplugins/eBay.src b/browser/locales/en-US/searchplugins/eBay.src
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/browser/locales/en-US/searchplugins/eBay.xml b/browser/locales/en-US/searchplugins/eBay.xml
new file mode 100755
index 00000000000..aa5337b2e95
--- /dev/null
+++ b/browser/locales/en-US/searchplugins/eBay.xml
@@ -0,0 +1,16 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearchdescription/1.1/">
+<os:ShortName>eBay</os:ShortName>
+<os:Description>eBay - Online actions</os:Description>
+<os:InputEncoding>ISO-8859-1</os:InputEncoding>
+<os:Image width="16" height="16">data:image/x-icon;base64,R0lGODlhEAAQAMQAAAAAAMz/zMwAADMAzOfn1sxmAP///5kAZpnM////AACZM/777zPMAP+ZAP8AAP9mmf/MzMwAZjNmAADMM/+ZM/9mM//MMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAQUAP8ALAAAAAAQABAAAAVPoCGOZGmeaKqiQDkMYqAoBqMELpxUlVTfBohjeHjBLJLZZCF0GASOAWJQSFAUE1FTwIUNKoYKTQslGCLSb6MBFD2G3Zdo0k4tVvi8fl8KAQA7</os:Image>
+<os:Url type="text/html" method="GET" template="http://search.ebay.com/search/search.dll">
+  <os:Param name="query" value="{searchTerms}"/>
+  <os:Param name="MfcISAPICommand" value="GetResult"/>
+  <os:Param name="ht" value="1"/>
+  <os:Param name="ebaytag1" value="ebayreg"/>
+  <os:Param name="srchdesc" value="n"/>
+  <os:Param name="maxRecordsReturned" value="300"/>
+  <os:Param name="maxRecordsPerPage" value="50"/>
+  <os:Param name="SortProperty" value="MetaEndSort"/>
+</os:Url>
+</SearchPlugin>
diff --git a/browser/locales/en-US/searchplugins/google.gif b/browser/locales/en-US/searchplugins/google.gif
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/locales/en-US/searchplugins/google.src b/browser/locales/en-US/searchplugins/google.src
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml
new file mode 100755
index 00000000000..712126f4253
--- /dev/null
+++ b/browser/locales/en-US/searchplugins/google.xml
@@ -0,0 +1,15 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearchdescription/1.1/">
+<os:ShortName>Google</os:ShortName>
+<os:Description>Google Search</os:Description>
+<os:InputEncoding>UTF-8</os:InputEncoding>
+<os:Image width="16" height="16">data:image/x-icon;base64,R0lGODlhEAAQAPfLAAATVikwdA8SnxUfgAsWpAAilholjxw4jBc7kwAlvQQ2sRMsoBUqqhMzuhY/vxw4tSgmiyM1mSUztiQ6sTE3sQ4qyxMxxRoyxiAuxR1CtBxJsBxasSJuuTFguBte0Rlf2xVc9h9W9xVjzxVr0gdj6BRh4R1o5yBcyiZbyydT1i9b2Ddb1iFY6CJg2Vpor1dzvEJu20Z0yi23QDy1REi2OUy0O1WzOVC4PU+tVUe5Sk2xQU2zRUO4UE21Ula2SmKEqWWF2HyPx2+a6X6e6Xqk1m+s78sUDs4UGdEQB9YfDdwaANEfHd0YEscjAM4mAM0qANIoD9IkGdslGswuItYgL4aP0ImP2YGZ36Opzaq2wq/S+rzX/7/e8MrS1MLO/sTb48rT8snX/83c89PZ+crq+cH1/9Dl/9Ln/93r/9fy/+Hf7P/42eDm/O7u/+T29uX2/eT2/+f4/+f5/+j/9u//8+3/9u7/9ur5/+j//+n//+v//u3//+7//e7//+////b66/T/6vX/6/f/7f/07fj/4fv/4Pj/5v/45v7/4/r+7/3/6fDw+Pfx//D/9/X/8fT/8/f/8ff/8/D///H///L8/fL///P///X7//b6/ff/+/T///b9//f///v19//w9v/09P/29v/x+f/y///z///1+v/1///2///3//j79P/58/z/8/z99/z/9v7/9P7/9vn7//v6//j9//n9//j///n///v//vv////4+v/5+//6+P/4///6/P/6/v/6///7///9+P/8+v/9+v7/+Pz////8/f/9/f79///8///9//7//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAMsALAAAAAAQABAAAAj/AEn4oIFjBw8bOnrMuJGjhowZM1T8UdYJUZ5ZcNRYWjSrVK5QU0DMmtUnzRAXEy4o6FCEy6NDTkQIq1MmRgM0eZTlCXMgQJtRSE4gmgUkwh1EiZTNUiamy6NUUExcuoJgDCdDjQg9KgVL2SNFT1hwEvKglLBWuixZ+jSrlSBdRlL04bBBkTBdpZTpIqWsFaBcTEr0QaEhl6dWlswKW6poDRUPlmAUQKWMkTJLc76QMQNGUZMWgIgkCFJnlq5WXigwkFClVZQQyuRgELAlk7JBymCZGYAF0ZEPrQixgUDAihxVdPpoAZAFUZIRfThxgvPCwAILDipk+OFG2ZIVoxApERtPfvwlvZ+kQFzPvv0MJQEBADs=</os:Image>
+<os:Url type="text/html" method="GET" template="http://www.google.com/search">
+  <os:Param name="q" value="{searchTerms}"/>
+  <os:Param name="start" value="0"/>
+  <os:Param name="ie" value="utf-8"/>
+  <os:Param name="oe" value="utf-8"/>
+  <os:Param name="client" value="firefox"/>
+  <!-- XXX Hard coded for now - will be removed -->
+  <os:Param name="rls" value="org.mozilla:en-US:unofficial"/>
+</os:Url>
+</SearchPlugin>
\ No newline at end of file
diff --git a/browser/locales/en-US/searchplugins/list.txt b/browser/locales/en-US/searchplugins/list.txt
index f8af3716e7e..eab1c1b33c3 100644
--- a/browser/locales/en-US/searchplugins/list.txt
+++ b/browser/locales/en-US/searchplugins/list.txt
@@ -1,6 +1,6 @@
-google
 amazondotcom
-eBay
-yahoo
-creativecommons
 answers
+creativecommons
+eBay
+google
+yahoo
diff --git a/browser/locales/en-US/searchplugins/yahoo.gif b/browser/locales/en-US/searchplugins/yahoo.gif
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/browser/locales/en-US/searchplugins/yahoo.src b/browser/locales/en-US/searchplugins/yahoo.src
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/browser/locales/en-US/searchplugins/yahoo.xml b/browser/locales/en-US/searchplugins/yahoo.xml
new file mode 100755
index 00000000000..ee6701410cf
--- /dev/null
+++ b/browser/locales/en-US/searchplugins/yahoo.xml
@@ -0,0 +1,11 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearchdescription/1.1/">
+<os:ShortName>Yahoo</os:ShortName>
+<os:Description>Yahoo Search</os:Description>
+<os:InputEncoding>UTF-8</os:InputEncoding>
+<os:Image width="16" height="16">data:image/x-icon;base64,R0lGODlhEAAQAJECAP8AAAAAAP///wAAACH5BAEAAAIALAAAAAAQABAAAAIplI+py+0NogQuyBDEnEd2kHkfFWUamEzmpZSfmaIHPHrRguUm/fT+UwAAOw==</os:Image>
+<os:Url type="text/html" method="GET" template="http://search.yahoo.com/search">
+  <os:Param name="p" value="{searchTerms}"/>
+  <os:Param name="ei" value="UTF-8"/>
+  <os:Param name="fr" value="moz2"/>
+</os:Url>
+</SearchPlugin>
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index b0c89ecfe2c..c3a94dd6bf0 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -18,8 +18,7 @@
     locale/browser/pageReportFirstTime.dtd         (%chrome/browser/pageReportFirstTime.dtd)
 *   locale/browser/safeMode.dtd                    (%chrome/browser/safeMode.dtd)
     locale/browser/sanitize.dtd                    (%chrome/browser/sanitize.dtd)
-    locale/browser/searchbar.properties            (%chrome/browser/searchbar.properties)
-*   locale/browser/searchDialog.dtd                (%chrome/browser/searchDialog.dtd)
+    locale/browser/search.properties               (%chrome/browser/search.properties)
     locale/browser/setDesktopBackground.dtd        (%chrome/browser/setDesktopBackground.dtd)
     locale/browser/shellservice.properties         (%chrome/browser/shellservice.properties)
 #ifdef MOZ_PLACES