Bug 1964668: Stop troubleshoot/safe mode from blocking win32k lockdown. r=handyman

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

security/sandbox/common/SandboxSettings.cpp

@@ -57,9 +57,6 @@ const char* ContentWin32kLockdownStateToString(
     case nsIXULRuntime::ContentWin32kLockdownState::DisabledByEnvVar:
       return "Win32k Lockdown disabled -- MOZ_ENABLE_WIN32K is set";
 
-    case nsIXULRuntime::ContentWin32kLockdownState::DisabledBySafeMode:
-      return "Win32k Lockdown disabled -- Running in Safe Mode";
-
     case nsIXULRuntime::ContentWin32kLockdownState::DisabledByE10S:
       return "Win32k Lockdown disabled -- E10S is disabled";
 

toolkit/components/telemetry/docs/data/environment.rst

@@ -492,7 +492,7 @@ Specific keys are:
   - MissingRemoteWebGL = 5
   - MissingNonNativeTheming = 6
   - DisabledByEnvVar = 7 - MOZ_ENABLE_WIN32K is set
-  - DisabledBySafeMode = 8
+  - DisabledBySafeMode = 8 - From Firefox 140 onwards, this value will no longer appear in Telemetry.
   - DisabledByE10S = 9 - E10S is disabled for whatever reason
   - DisabledByUserPref = 10 - The user manually set security.sandbox.content.win32k-disable to false
   - EnabledByUserPref = 11 - The user manually set security.sandbox.content.win32k-disable to true

toolkit/xre/nsAppRunner.cpp

@@ -755,10 +755,6 @@ nsIXULRuntime::ContentWin32kLockdownState GetLiveWin32kLockdownState() {
   mozilla::EnsureWin32kInitialized();
   gfxPlatform::GetPlatform();
 
-  if (gSafeMode) {
-    return nsIXULRuntime::ContentWin32kLockdownState::DisabledBySafeMode;
-  }
-
   if (EnvHasValue("MOZ_ENABLE_WIN32K")) {
     return nsIXULRuntime::ContentWin32kLockdownState::DisabledByEnvVar;
   }

xpcom/system/nsIXULRuntime.idl

@@ -88,7 +88,7 @@ interface nsIXULRuntime : nsISupports
     MissingRemoteWebGL = 5,
     MissingNonNativeTheming = 6,
     DisabledByEnvVar = 7,  // - MOZ_ENABLE_WIN32K is set
-    DisabledBySafeMode = 8,
+    //DisabledBySafeMode = 8,
     DisabledByE10S = 9,      // - E10S is disabled for whatever reason
     DisabledByUserPref = 10,  // - The user manually set
                              // security.sandbox.content.win32k-disable to false