Fix for bug 138299 - switch consumers of nsIWindowMediator service to use the non-RDF contractID, in preparation for bug 132175

r=danm, sr=jag

suite/common/history/findHistory.js

@@ -71,7 +71,7 @@ function find()
 var gCreatingNewWindow = false;
 function findMostRecentWindow(aType, aURI, aParam)
 {
-  var WM = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+  var WM = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
   WM = WM.QueryInterface(Components.interfaces.nsIWindowMediator);
   var topWindow = WM.getMostRecentWindow(aType);
   if (!topWindow) gCreatingNewWindow = true;

suite/common/history/history.js

@@ -422,7 +422,7 @@ function updateItems()
     copyLocationItem.removeAttribute("hidden");
     sep1.removeAttribute("hidden");
     if (!gWindowManager) {
-      gWindowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+      gWindowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
       gWindowManager = gWindowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
     }
     var topWindowOfType = gWindowManager.getMostRecentWindow("navigator:browser");

suite/common/search/search-panel.js

@@ -42,7 +42,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-const WMEDIATOR_CONTRACTID     = "@mozilla.org/rdf/datasource;1?name=window-mediator";
+const WMEDIATOR_CONTRACTID     = "@mozilla.org/appshell/window-mediator;1";
 const ISEARCH_CONTRACTID       = "@mozilla.org/rdf/datasource;1?name=internetsearch";
 const RDFSERVICE_CONTRACTID    = "@mozilla.org/rdf/rdf-service;1";
 const BMARKS_CONTRACTID        = "@mozilla.org/browser/bookmarks-service;1";

suite/common/sidebar/sidebarOverlay.js

@@ -1033,7 +1033,7 @@ function enable_customize() {
 // Bring up the Sidebar customize dialog.
 function SidebarCustomize() {
   // Use a single sidebar customize dialog
-  var cwindowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+  var cwindowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
   var iwindowManager = Components.interfaces.nsIWindowMediator;
   var windowManager  = cwindowManager.QueryInterface(iwindowManager);