Backing out bug 402294, since I forgot it needed approval to land

camino/config/Camino.xcconfig

@@ -14,7 +14,7 @@ GCC_ENABLE_PASCAL_STRINGS = YES
 GCC_PREPROCESSOR_DEFINITIONS = OSTYPE=Darwin1.4 OSARCH=Darwin MOZILLA_INTERNAL_API=1
 OTHER_LDFLAGS = -lpthread -lm -Wl,-executable_path,../dist/bin
 LIBRARY_SEARCH_PATHS = ../dist/bin ../dist/lib
-HEADER_SEARCH_PATHS = ../dist/include/ ../dist/include/appcomps ../dist/include/caps ../dist/include/chardet ../dist/include/chrome ../dist/include/commandhandler ../dist/include/composer ../dist/include/content ../dist/include/cookie ../dist/include/docshell ../dist/include/dom ../dist/include/downloads ../dist/include/editor ../dist/include/embed_base ../dist/include/exthandler ../dist/include/find ../dist/include/gfx ../dist/include/helperAppDlg ../dist/include/history ../dist/include/htmlparser ../dist/include/intl ../dist/include/js ../dist/include/layout ../dist/include/locale ../dist/include/mimetype ../dist/include/mork ../dist/include/necko ../dist/include/nkcache ../dist/include/nspr ../dist/include/pipboot ../dist/include/pipnss ../dist/include/pref ../dist/include/profdirserviceprovider ../dist/include/shistory ../dist/include/spellchecker ../dist/include/string ../dist/include/thebes ../dist/include/txtsvc ../dist/include/uconv ../dist/include/unicharutil ../dist/include/uriloader ../dist/include/view ../dist/include/webbrowserpersist ../dist/include/webbrwsr ../dist/include/webshell ../dist/include/widget ../dist/include/windowwatcher ../dist/include/xmlextras ../dist/include/xpcom ../dist/include/xpcom_obsolete ../dist/include/xpconnect ../dist/include/xultmpl ../dist/public/nss $(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon $(LOCAL_LIBRARY_DIR)/Frameworks/SharedMenusCocoa.framework/Headers
+HEADER_SEARCH_PATHS = ../dist/include/ ../dist/include/appcomps ../dist/include/caps ../dist/include/chardet ../dist/include/chrome ../dist/include/commandhandler ../dist/include/composer ../dist/include/content ../dist/include/cookie ../dist/include/docshell ../dist/include/dom ../dist/include/downloadmanager ../dist/include/editor ../dist/include/embed_base ../dist/include/exthandler ../dist/include/find ../dist/include/gfx ../dist/include/helperAppDlg ../dist/include/history ../dist/include/htmlparser ../dist/include/intl ../dist/include/js ../dist/include/layout ../dist/include/locale ../dist/include/mimetype ../dist/include/mork ../dist/include/necko ../dist/include/nkcache ../dist/include/nspr ../dist/include/pipboot ../dist/include/pipnss ../dist/include/pref ../dist/include/profdirserviceprovider ../dist/include/shistory ../dist/include/spellchecker ../dist/include/string ../dist/include/thebes ../dist/include/txtsvc ../dist/include/uconv ../dist/include/unicharutil ../dist/include/uriloader ../dist/include/view ../dist/include/webbrowserpersist ../dist/include/webbrwsr ../dist/include/webshell ../dist/include/widget ../dist/include/windowwatcher ../dist/include/xmlextras ../dist/include/xpcom ../dist/include/xpcom_obsolete ../dist/include/xpconnect ../dist/include/xultmpl ../dist/public/nss $(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon $(LOCAL_LIBRARY_DIR)/Frameworks/SharedMenusCocoa.framework/Headers
 
 // Warning settings
 GCC_WARN_SIGN_COMPARE = YES

camino/src/download/nsDownloadListener.mm

@@ -150,16 +150,16 @@ nsDownloadListener::GetPercentComplete(PRInt32 *aPercentComplete)
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* readonly attribute PRInt64 amountTransferred; */
+/* readonly attribute PRUint64 amountTransferred; */
 NS_IMETHODIMP
-nsDownloadListener::GetAmountTransferred(PRInt64 *aAmountTransferred)
+nsDownloadListener::GetAmountTransferred(PRUint64 *aAmountTransferred)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* readonly attribute PRInt64 size; */
+/* readonly attribute PRUint64 size; */
 NS_IMETHODIMP
-nsDownloadListener::GetSize(PRInt64 *aSize)
+nsDownloadListener::GetSize(PRUint64 *aSize)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
@@ -215,11 +215,6 @@ nsDownloadListener::GetState(PRInt16 *aState)
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP
-nsDownloadListener::GetReferrer(nsIURI * *aReferrer) {
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 #pragma mark -
 
 /* void onProgressChange64 (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long long aCurSelfProgress, in long long aMaxSelfProgress, in long long a

toolkit/components/Makefile.in

@@ -138,10 +138,7 @@ EXTRA_PP_COMPONENTS = nsDefaultCLH.js
 endif # MOZ_XUL_APP
 
 ifeq ($(MOZ_BUILD_APP),camino)
-DIRS += \
-	autocomplete/public \
-	downloads/public \
-	$(NULL)
+DIRS += autocomplete/public
 endif
 
 include $(topsrcdir)/config/rules.mk

xpfe/components/Makefile.in

@@ -87,10 +87,8 @@ ifndef MOZ_XULRUNNER
 DIRS += \
         related \
         autocomplete \
+        download-manager \
         $(NULL)
-ifneq ($(MOZ_BUILD_APP),camino)
-DIRS += download-manager
-endif
 ifndef MOZ_XUL_APP
 DIRS += \
         console \