Bug 331476 - Make storage test use the XPCOM glue, r=vlad

storage/test/Makefile.in

@@ -44,7 +44,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 PROGRAM = teststorage1$(BIN_SUFFIX)
-MOZILLA_INTERNAL_API = 1
 
 CPPSRCS = storage1.cpp
 
@@ -57,7 +56,7 @@ REQUIRES = \
 
 LIBS = \
 	$(LIBS_DIR) \
-	$(XPCOM_LIBS) \
+	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
 

storage/test/storage1.cpp

@@ -5,8 +5,9 @@
 #include "nsIComponentManager.h"
 #include "nsISimpleEnumerator.h"
 #include "nsIServiceManager.h"
+#include "nsServiceManagerUtils.h"
 #include "nsCOMPtr.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsILocalFile.h"
 
 #include "mozIStorageService.h"