Bug 224829 - docshell should not require non-gecko interface nsIBrowserHistory. This was fixed by introducing a new interface nsIGlobalHistory2 to replace the current nsIGlobalHistory. There are two-way adapters so that the frozen interface still works. r=biesi sr=bz a=mscott for toolkit/ changes.

toolkit/components/build/nsToolkitCompsModule.cpp

@@ -41,6 +41,7 @@
 #include "nsAlertsService.h"
 #endif
 #include "nsToolkitCompsCID.h"
+#include "nsDocShellCID.h"
 #include "nsAutoCompleteController.h"
 #include "nsAutoCompleteMdbResult.h"
 #include "nsDownloadManager.h"
@@ -122,7 +123,7 @@ static const nsModuleComponentInfo components[] =
 
   { "Global History",
     NS_GLOBALHISTORY_CID,
-    NS_GLOBALHISTORY_CONTRACTID,
+    NS_GLOBALHISTORY2_CONTRACTID,
     nsGlobalHistoryConstructor },
     
   { "Global History",