fixup! Bug 41149: Re-enable DLL injection protection in all builds not just nightlies

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Changed BASE_BROWSER with BASE_BROWSER_VERSION.

toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp

@@ -531,7 +531,7 @@ continue_loading:
   return ret;
 }
 
-#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER)
+#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER_VERSION)
 // Map of specific thread proc addresses we should block. In particular,
 // LoadLibrary* APIs which indicate DLL injection
 static void* gStartAddressesToBlock[4];
@@ -544,7 +544,7 @@ static bool ShouldBlockThread(void* aStartAddress) {
     return false;
   }
 
-#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER)
+#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER_VERSION)
   for (auto p : gStartAddressesToBlock) {
     if (p == aStartAddress) {
       return true;
@@ -618,7 +618,7 @@ MFBT_API void DllBlocklist_Initialize(uint32_t aInitFlags) {
     }
   }
 
-#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER)
+#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER_VERSION)
   // Populate a list of thread start addresses to block.
   HMODULE hKernel = GetModuleHandleW(L"kernel32.dll");
   if (hKernel) {