Bug 1725145 - fixes in dom for win in non unified env. r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D123544

dom/quota/QuotaCommon.cpp

@@ -107,7 +107,7 @@ void AnonymizeOriginString(nsACString& aOriginString) {
 #ifdef XP_WIN
 void CacheUseDOSDevicePathSyntaxPrefValue() {
   MOZ_ASSERT(XRE_IsParentProcess());
-  AssertIsOnBackgroundThread();
+  ::mozilla::ipc::AssertIsOnBackgroundThread();
 
   if (gUseDOSDevicePathSyntax == -1) {
     bool useDOSDevicePathSyntax =

dom/security/nsContentSecurityUtils.cpp

@@ -21,6 +21,7 @@
 #include "nsNetUtil.h"
 #include "nsSandboxFlags.h"
 #if defined(XP_WIN)
+#  include "mozilla/WinHeaderOnlyUtils.h"
 #  include "WinUtils.h"
 #  include <wininet.h>
 #endif