Fix firebird and thunderbird bustage by unforking contents of nsIGlobalHistory (which was frozen) and by tweaking the root Makefile.in. b=212509 r=mscott

Makefile.in

@@ -216,11 +216,16 @@ endif
 tier_9_dirs	+= \
 		xpfe/appshell \
 		xpfe/browser/public \
-		xpfe/components/history/public \
 		xpfe/components/sidebar/public \
 		xpfe/components/xremote/public \
 		$(NULL)
 
+ifdef MOZ_XUL_APP
+tier_9_dirs	+= toolkit/components/history/public
+else
+tier_9_dirs	+= xpfe/components/history/public
+endif
+
 ifdef ACCESSIBILITY
 tier_9_dirs    += accessible
 endif
@@ -256,13 +261,22 @@ ifdef MOZ_XUL_APP
 tier_50_dirs	+= toolkit
 endif
 
+ifdef MOZ_PHOENIX
+# xpfe/components/search depends on nsIBookmarksService.idl
+tier_50_dirs    += browser/components/bookmarks/public
+endif
+
 #
 # tier 9x - application features
 #
 
 ifdef MOZ_XPINSTALL
+ifdef MOZ_XUL_APP
+tier_50_dirs     +=  xpinstall
+else
 tier_90_dirs     +=  xpinstall
 endif
+endif
 
 ifdef MOZ_JSDEBUGGER
 tier_93_dirs	+= js/jsd

embedding/browser/webBrowser/nsWebBrowser.cpp

@@ -67,10 +67,6 @@
 // PSM2 includes
 #include "nsISecureBrowserUI.h"
 
-#ifdef MOZ_PHOENIX
-#include "nsToolkitCompsCID.h"
-#endif
-
 #if (defined(XP_MAC) || defined(XP_MACOSX)) && !defined(MOZ_WIDGET_COCOA)
 #include <MacWindows.h>
 #include "nsWidgetSupport.h"

toolkit/components/build/nsToolkitCompsCID.h

@@ -50,12 +50,6 @@
 #define NS_FORMHISTORYAUTOCOMPLETE_CONTRACTID \
   "@mozilla.org/autocomplete/search;1?name=form-history"
 
-#define NS_GLOBALHISTORY_CONTRACTID \
-  "@mozilla.org/browser/global-history;1"
-
-#define NS_GLOBALHISTORY_DATASOURCE_CONTRACTID \
-  "@mozilla.org/rdf/datasource;1?name=history"
-
 #define NS_GLOBALHISTORY_AUTOCOMPLETE_CONTRACTID \
     "@mozilla.org/autocomplete/search;1?name=history"
 
@@ -76,7 +70,3 @@
 // {A2059C0E-5A58-4c55-AB7C-26F0557546EF}
 #define NS_FORMHISTORY_CID \
 { 0xa2059c0e, 0x5a58, 0x4c55, { 0xab, 0x7c, 0x26, 0xf0, 0x55, 0x75, 0x46, 0xef } }
-
-// {9491C382-E3C4-11D2-BDBE-0050040A9B44}
-#define NS_GLOBALHISTORY_CID \
-{ 0x9491c382, 0xe3c4, 0x11d2, { 0xbd, 0xbe, 0x0, 0x50, 0x4, 0xa, 0x9b, 0x44} }

toolkit/components/history/public/nsIGlobalHistory.idl

@@ -36,6 +36,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 /**
+ *
  * The interface to global history.
  *
  * @status FROZEN
@@ -65,3 +66,16 @@ interface nsIGlobalHistory : nsISupports
      */
     boolean isVisited(in string aURL);
 };
+
+%{ C++
+// {9491C382-E3C4-11D2-BDBE-0050040A9B44}
+#define NS_GLOBALHISTORY_CID \
+{ 0x9491c382, 0xe3c4, 0x11d2, { 0xbd, 0xbe, 0x0, 0x50, 0x4, 0xa, 0x9b, 0x44} }
+
+#define NS_GLOBALHISTORY_CONTRACTID \
+    "@mozilla.org/browser/global-history;1"
+
+#define NS_GLOBALHISTORY_DATASOURCE_CONTRACTID \
+    "@mozilla.org/rdf/datasource;1?name=history"
+%}
+

uriloader/exthandler/nsExternalHelperAppService.cpp

@@ -87,9 +87,6 @@
 #include "nsIPrefService.h"
 
 #include "nsIGlobalHistory.h"
-#ifdef MOZ_PHOENIX
-#include "nsToolkitCompsCID.h"
-#endif
 
 #include "nsCRT.h"
 #include "plstr.h"