moving phoenix history from browser to toolkit to fix bustage, sr=bryner

embedding/browser/webBrowser/Makefile.in

@@ -38,7 +38,7 @@ REQUIRES	= xpcom \
 		  necko \
 		  uriloader \
 		  history \
-		  browsercomps \
+		  toolkitcomps \
 		  shistory \
 		  webshell \
 		  windowwatcher \

embedding/browser/webBrowser/nsWebBrowser.cpp

@@ -67,7 +67,7 @@
 #include "nsISecureBrowserUI.h"
 
 #ifdef MOZ_PHOENIX
-#include "nsBrowserCompsCID.h"
+#include "nsToolkitCompsCID.h"
 #endif
 
 static NS_DEFINE_CID(kWebShellCID, NS_WEB_SHELL_CID);

xpfe/browser/resources/content/sessionHistoryUI.js

@@ -167,11 +167,11 @@ function addToUrlbarHistory()
   if (!gRDF)
      gRDF = Components.classes["@mozilla.org/rdf/rdf-service;1"]
                       .getService(Components.interfaces.nsIRDFService);
-
+ 
   if (!gGlobalHistory)
     gGlobalHistory = Components.classes["@mozilla.org/browser/global-history;1"]
                                .getService(Components.interfaces.nsIBrowserHistory);
-  
+
   if (!gURIFixup)
     gURIFixup = Components.classes["@mozilla.org/docshell/urifixup;1"]
                           .getService(Components.interfaces.nsIURIFixup);

xpfe/browser/src/Makefile.in

@@ -51,7 +51,7 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 ifdef MOZ_PHOENIX
-REQUIRES += browsercomps history
+REQUIRES += toolkitcomps history
 endif
 
 CPPSRCS		= \

xpfe/browser/src/nsBrowserInstance.cpp

@@ -103,7 +103,7 @@
 #include "nsIProxyObjectManager.h" 
 
 #ifdef MOZ_PHOENIX
-#include "nsBrowserCompsCID.h"
+#include "nsToolkitCompsCID.h"
 #endif
 
 #include "nsBrowserStatusFilter.h"