Backed out 3 changesets (bug 1430857) for breaking tests on Windows Code Coverage builds a=backout

Backed out changeset a992887a6060 (bug 1430857)
Backed out changeset cc9b0ac5f66b (bug 1430857)
Backed out changeset 4bdd6d82f993 (bug 1430857)

Author: dgluca

browser/app/nsBrowserApp.cpp

@@ -28,14 +28,14 @@
 #ifdef MOZ_SANDBOX
 #include "mozilla/sandboxing/SandboxInitialization.h"
 #endif
-#include "mozilla/WindowsDllBlocklist.h"
 #endif
 #include "BinaryPath.h"
 
 #include "nsXPCOMPrivate.h" // for MAXPATHLEN and XPCOM_DLL
 
 #include "mozilla/Sprintf.h"
 #include "mozilla/StartupTimeline.h"
+#include "mozilla/WindowsDllBlocklist.h"
 
 #ifdef LIBFUZZER
 #include "FuzzerDefs.h"

ipc/app/MozillaRuntimeMain.cpp

@@ -7,10 +7,7 @@
 #include "../contentproc/plugin-container.cpp"
 
 #include "mozilla/Bootstrap.h"
-
-#if defined(XP_WIN)
 #include "mozilla/WindowsDllBlocklist.h"
-#endif // defined(XP_WIN)
 
 using namespace mozilla;
 

js/xpconnect/shell/xpcshell.cpp

@@ -8,6 +8,7 @@
 
 #include <stdio.h>
 
+#include "mozilla/WindowsDllBlocklist.h"
 #include "mozilla/Bootstrap.h"
 
 #include "nsXULAppAPI.h"
@@ -25,7 +26,6 @@
 #ifdef MOZ_SANDBOX
 #include "mozilla/sandboxing/SandboxInitialization.h"
 #endif
-#include "mozilla/WindowsDllBlocklist.h"
 #endif
 
 #ifdef MOZ_WIDGET_GTK

mozglue/build/Authenticode.cpp

@@ -23,8 +23,8 @@
 #include <map>
 #pragma warning( pop )
 
-#include "Authenticode.h"
 #include "nsAutoPtr.h"
+
 #include "nsWindowsDllInterceptor.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/StackWalk_windows.h"
@@ -33,7 +33,7 @@
 #include "nsWindowsHelpers.h"
 #include "WindowsDllBlocklist.h"
 #include "mozilla/AutoProfilerLabel.h"
-#include "mozilla/glue/WindowsDllServices.h"
+#include "mozilla/WindowsDllServices.h"
 
 using namespace mozilla;
 
@@ -938,7 +938,7 @@ DllBlocklist_CheckStatus()
 
 
 static SRWLOCK gDllServicesLock = SRWLOCK_INIT;
-static mozilla::glue::detail::DllServicesBase* gDllServices;
+static mozilla::detail::DllServicesBase* gDllServices;
 
 class MOZ_RAII AutoSharedLock final
 {
@@ -1047,30 +1047,22 @@ DllLoadNotification(ULONG aReason, PCLDR_DLL_NOTIFICATION_DATA aNotificationData
   gDllServices->DispatchDllLoadNotification(fullDllName);
 }
 
-namespace mozilla {
-Authenticode* GetAuthenticode();
-} // namespace mozilla
-
 MFBT_API void
-DllBlocklist_SetDllServices(mozilla::glue::detail::DllServicesBase* aSvc)
+DllBlocklist_SetDllServices(mozilla::detail::DllServicesBase* aSvc)
 {
   AutoExclusiveLock lock(gDllServicesLock);
 
-  if (aSvc) {
-    aSvc->SetAuthenticodeImpl(GetAuthenticode());
+  if (aSvc && !gNotificationCookie) {
+    auto pLdrRegisterDllNotification =
+      reinterpret_cast<decltype(&::LdrRegisterDllNotification)>(
+        ::GetProcAddress(::GetModuleHandleW(L"ntdll.dll"),
+                         "LdrRegisterDllNotification"));
 
-    if (!gNotificationCookie) {
-      auto pLdrRegisterDllNotification =
-        reinterpret_cast<decltype(&::LdrRegisterDllNotification)>(
-          ::GetProcAddress(::GetModuleHandleW(L"ntdll.dll"),
-                           "LdrRegisterDllNotification"));
+    MOZ_DIAGNOSTIC_ASSERT(pLdrRegisterDllNotification);
 
-      MOZ_DIAGNOSTIC_ASSERT(pLdrRegisterDllNotification);
-
-      NTSTATUS ntStatus = pLdrRegisterDllNotification(0, &DllLoadNotification,
-                                                      nullptr, &gNotificationCookie);
-      MOZ_DIAGNOSTIC_ASSERT(NT_SUCCESS(ntStatus));
-    }
+    NTSTATUS ntStatus = pLdrRegisterDllNotification(0, &DllLoadNotification,
+                                                    nullptr, &gNotificationCookie);
+    MOZ_DIAGNOSTIC_ASSERT(NT_SUCCESS(ntStatus));
   }
 
   gDllServices = aSvc;

mozglue/build/Authenticode.h

@@ -26,14 +26,12 @@ MFBT_API bool DllBlocklist_CheckStatus();
 
 // Forward declaration
 namespace mozilla {
-namespace glue {
 namespace detail {
 class DllServicesBase;
 } // namespace detail
-} // namespace glue
 } // namespace mozilla
 
-MFBT_API void DllBlocklist_SetDllServices(mozilla::glue::detail::DllServicesBase* aSvc);
+MFBT_API void DllBlocklist_SetDllServices(mozilla::detail::DllServicesBase* aSvc);
 
 #endif // defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
 #endif // mozilla_windowsdllblocklist_h