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/browser/navigator.js

@@ -818,7 +818,7 @@ function OpenSearch(tabName, forceDialogFlag, searchStr, newWindowFlag)
 
       if (forceDialogFlag || searchMode == 1) {
         // Use a single search dialog
-        var windowManager = Components.classes["@mozilla.org/rdf/datasource;1?name=window-mediator"]
+        var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"]
                                       .getService(Components.interfaces.nsIWindowMediator);
 
         var searchWindow = windowManager.getMostRecentWindow("search:window");
@@ -942,7 +942,7 @@ function enableBookmarks()
 function BrowserEditBookmarks()
 {
   // Use a single sidebar bookmarks dialog
-  var windowManager = Components.classes["@mozilla.org/rdf/datasource;1?name=window-mediator"]
+  var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"]
                                 .getService(Components.interfaces.nsIWindowMediator);
 
   var bookmarksWindow = windowManager.getMostRecentWindow("bookmarks:manager");
@@ -1729,7 +1729,7 @@ function toHistory()
 {
   // Use a single sidebar history 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);
 

suite/browser/nsBrowserContentListener.js

@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-const mediatorContractId = "@mozilla.org/rdf/datasource;1?name=window-mediator";
+const mediatorContractId = "@mozilla.org/appshell/window-mediator;1";
 const nsIWebBrowserChrome = Components.interfaces.nsIWebBrowserChrome;
 
 function nsBrowserContentListener(toplevelWindow, contentWindow)