Bug #239136 --> Thunderbird needs to integrate with the new download manager in toolkit

sr=bsmedberg

mail/config/basemail-unix

@@ -93,8 +93,6 @@ components/libwalletviewers.so
 ; download progress
 components/nsProgressDialog.js
 components/nsHelperAppDlg.js
-components/nsDownloadProgressListener.js
-components/downloadmanager.xpt
 
 ; spellchecker (may not be present)
 components/libmyspell.so

mail/installer/removed-files.in

@@ -155,8 +155,10 @@ components/xpconnect.xpt
 components/xpinstall.xpt 
 components/xuldoc.xpt 
 components/xultmpl.xpt
+components/downloadmanager.xpt
 #endif
 components/nsBackgroundUpdateService.js
+components/nsDownloadProgressListener.js
 components/xptitemp.dat
 component.reg
 chrome/installed-chrome.txt

mail/installer/windows/packages-static

@@ -150,10 +150,8 @@ bin\components\wallet.xpt
 bin\components\signonviewer.xpt 
 
 ; download progress
-bin\components\nsProgressDialog.js
 bin\components\nsHelperAppDlg.js
-bin\components\nsDownloadProgressListener.js
-bin\components\downloadmanager.xpt
+bin\components\nsProgressDialog.js
 
 ; spellchecker (may not be present)
 bin\components\myspell.dll

toolkit/components/build/nsToolkitCompsModule.cpp

@@ -44,11 +44,12 @@
 #include "nsAlertsService.h"
 #endif
 
-#ifndef MOZ_THUNDERBIRD
 #ifdef MOZ_XPINSTALL
 #include "nsDownloadManager.h"
 #include "nsDownloadProxy.h"
 #endif
+
+#ifndef MOZ_THUNDERBIRD
 #include "nsTypeAheadFind.h"
 #endif
 
@@ -61,12 +62,13 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService)
 #endif
 
-#ifndef MOZ_THUNDERBIRD
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsTypeAheadFind)
 #ifdef MOZ_XPINSTALL
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDownloadManager, Init) 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
 #endif
+
+#ifndef MOZ_THUNDERBIRD
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsTypeAheadFind)
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
@@ -88,7 +90,6 @@ static const nsModuleComponentInfo components[] =
     NS_ALERTSERVICE_CONTRACTID,
     nsAlertsServiceConstructor },
 #endif
-#ifndef MOZ_THUNDERBIRD
 #ifdef MOZ_XPINSTALL
   { "Download Manager",
     NS_DOWNLOADMANAGER_CID,
@@ -99,7 +100,7 @@ static const nsModuleComponentInfo components[] =
     NS_TRANSFER_CONTRACTID,
     nsDownloadProxyConstructor },
 #endif
-
+#ifndef MOZ_THUNDERBIRD
   { "TypeAheadFind Component", NS_TYPEAHEADFIND_CID,
     NS_TYPEAHEADFIND_CONTRACTID, nsTypeAheadFindConstructor
   },