merge backout, r=backout CLOSED TREE

toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp

@@ -43,7 +43,7 @@ MyEventUnregister gEventUnregister = NULL;
 nsParentalControlsServiceWin::nsParentalControlsServiceWin() :
   mPC(nsnull)
 , mEnabled(false)
-, mProvider(NULL)
+, mProvider(nsnull)
 {
   HRESULT hr;
   CoInitialize(NULL);

toolkit/library/dlldeps-xul.cpp

@@ -6,7 +6,7 @@
 
 void xxxNeverCalledXUL()
 {
-  XRE_main(0, nsnull, nsnull, 0);
+  XRE_main(0, nsnull, nsnull, nsnull);
   XRE_GetFileFromPath(nsnull, nsnull);
   XRE_LockProfileDirectory(nsnull, nsnull);
   XRE_InitEmbedding2(nsnull, nsnull, nsnull);