Bug 335558 r=benjamin

Make storage form history use Mork if available

toolkit/components/satchel/src/Makefile.in

@@ -67,6 +67,8 @@ REQUIRES =	\
 		unicharutil \
 		intl \
 		pref \
+		storage \
+		morkreader \
 		windowwatcher \
 		toolkitcomps \
 		$(NULL)
@@ -74,18 +76,12 @@ REQUIRES =	\
 CPPSRCS = nsFormFillController.cpp \
           $(NULL)
 
-ifdef MOZ_STORAGE
+ifdef MOZ_PLACES
-REQUIRES += storage
 CPPSRCS += nsStorageFormHistory.cpp
-ifdef MOZ_MORKREADER
+else
-REQUIRES += morkreader
-endif
-else # MOZ_STORAGE
-ifdef MOZ_MORK
 REQUIRES += mork
 CPPSRCS += nsFormHistory.cpp
 endif
-endif # MOZ_STORAGE
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../../passwordmgr/base \

toolkit/components/satchel/src/nsFormFillController.cpp

@@ -39,10 +39,10 @@
 
 #include "nsFormFillController.h"
 
-#ifdef MOZ_STORAGE
+#ifdef MOZ_PLACES
 #include "nsStorageFormHistory.h"
 #include "nsIAutoCompleteSimpleResult.h"
-#elif defined(MOZ_MORK)
+#else
 #include "nsFormHistory.h"
 #include "nsIAutoCompleteResultTypes.h"
 #endif
@@ -466,14 +466,12 @@ nsFormFillController::StartSearch(const nsAString &aSearchString, const nsAStrin
 {
   nsCOMPtr<nsIAutoCompleteResult> result;
 
-#ifdef MOZ_STORAGE
+#ifdef MOZ_PLACES
   // This assumes that FormHistory uses nsIAutoCompleteSimpleResult,
   // while PasswordManager does not.
   nsCOMPtr<nsIAutoCompleteSimpleResult> historyResult;
-#elif defined(MOZ_MORK)
-  nsCOMPtr<nsIAutoCompleteMdbResult2> historyResult;
 #else
-#error either mozstorage or mork must be compiled
+  nsCOMPtr<nsIAutoCompleteMdbResult2> historyResult;
 #endif
   historyResult = do_QueryInterface(aPreviousResult);