Bug 1915228 - Remove expired telemetry scalar startup.skeleton_ui_disabled_reason, r=win-reviewers,TravisLong,gstoll.

Depends on D220334

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

mozglue/misc/PreXULSkeletonUI.cpp

@@ -2061,10 +2061,6 @@ HWND ConsumePreXULSkeletonUIHandle() {
   return result;
 }
 
-Maybe<PreXULSkeletonUIError> GetPreXULSkeletonUIErrorReason() {
-  return sErrorReason;
-}
-
 Result<Ok, PreXULSkeletonUIError> PersistPreXULSkeletonUIValues(
     const SkeletonUISettings& settings) {
   if (!sPreXULSkeletonUIEnabled) {

mozglue/misc/PreXULSkeletonUI.h

@@ -101,61 +101,6 @@ enum class PreXULSkeletonUIError : uint32_t {
   Unknown,
 };
 
-inline const wchar_t* GetPreXULSkeletonUIErrorString(
-    PreXULSkeletonUIError error) {
-  switch (error) {
-    case PreXULSkeletonUIError::None:
-      return L"None";
-    case PreXULSkeletonUIError::Disabled:
-      return L"Disabled";
-    case PreXULSkeletonUIError::OOM:
-      return L"OOM";
-    case PreXULSkeletonUIError::Cmdline:
-      return L"Cmdline";
-    case PreXULSkeletonUIError::EnvVars:
-      return L"EnvVars";
-    case PreXULSkeletonUIError::FailedToOpenRegistryKey:
-      return L"FailedToOpenRegistryKey";
-    case PreXULSkeletonUIError::RegistryError:
-      return L"RegistryError";
-    case PreXULSkeletonUIError::FailedLoadingDynamicProcs:
-      return L"FailedLoadingDynamicProcs";
-    case PreXULSkeletonUIError::FailedGettingLock:
-      return L"FailedGettingLock";
-    case PreXULSkeletonUIError::FilesystemFailure:
-      return L"FilesystemFailure";
-    case PreXULSkeletonUIError::NoStartWithLastProfile:
-      return L"NoStartWithLastProfile";
-    case PreXULSkeletonUIError::FailedRegisteringWindowClass:
-      return L"FailedRegisteringWindowClass";
-    case PreXULSkeletonUIError::CorruptData:
-      return L"CorruptData";
-    case PreXULSkeletonUIError::BadWindowDimensions:
-      return L"BadWindowDimensions";
-    case PreXULSkeletonUIError::FailedGettingMonitorInfo:
-      return L"FailedGettingMonitorInfo";
-    case PreXULSkeletonUIError::EnabledKeyDoesNotExist:
-      return L"EnabledKeyDoesNotExist";
-    case PreXULSkeletonUIError::CreateWindowFailed:
-      return L"CreateWindowFailed";
-    case PreXULSkeletonUIError::FailedGettingDC:
-      return L"FailedGettingDC";
-    case PreXULSkeletonUIError::FailedBlitting:
-      return L"FailedBlitting";
-    case PreXULSkeletonUIError::FailedFillingBottomRect:
-      return L"FailedFillingBottomRect";
-    case PreXULSkeletonUIError::CrashedOnce:
-      return L"CrashedOnce";
-    case PreXULSkeletonUIError::BadUIDensity:
-      return L"BadUIDensity";
-    case PreXULSkeletonUIError::Unknown:
-      return L"Unknown";
-  }
-
-  MOZ_ASSERT_UNREACHABLE();
-  return L"Unknown";
-}
-
 enum class PreXULSkeletonUIProgress : uint32_t {
   Started,
   Completed,
@@ -166,7 +111,6 @@ MFBT_API void CreateAndStorePreXULSkeletonUI(HINSTANCE hInstance, int argc,
 MFBT_API void CleanupProcessRuntime();
 MFBT_API bool GetPreXULSkeletonUIWasShown();
 MFBT_API HWND ConsumePreXULSkeletonUIHandle();
-MFBT_API Maybe<PreXULSkeletonUIError> GetPreXULSkeletonUIErrorReason();
 MFBT_API bool WasPreXULSkeletonUIMaximized();
 MFBT_API Result<Ok, PreXULSkeletonUIError> PersistPreXULSkeletonUIValues(
     const SkeletonUISettings& settings);

toolkit/components/telemetry/Scalars.yaml

@@ -5825,85 +5825,6 @@ startup:
     record_in_processes:
       - 'main'
 
-  skeleton_ui_disabled_reason:
-    bug_numbers:
-      - 1686301
-    description: >
-      The reason why the skeleton UI was not shown to the user. This should be
-      one of the following values:
-        None:
-          There was no reason for not showing the skeleton UI. This should not
-          be recorded.
-        Ineligible:
-          The user was ineligible for the skeleton UI due to information which
-          should already be trivially available via telemetry (i.e., the user
-          is running an OS version that doesn't support the skeleton UI.)
-        Disabled:
-          The registry specified "Enabled" as 0 for the skeleton UI.
-        EnabledKeyDoesNotExist:
-          The "Enabled" key in the registry does not exist.
-        OOM:
-          We encountered an allocation failure while trying to show the
-          skeleton UI.
-        Cmdline:
-          The skeleton UI was disabled due to the presence of an unsupported
-          command line argument.
-        EnvVars:
-          The skeleton UI was disabled due to an explicitly unsupported
-          environment variable.
-        FailedToOpenRegistryKey:
-          We were unable to open the skeleton UI Windows registry key.
-        RegistryError:
-          We encountered an error trying to read/write a skeleton UI registry
-          value.
-        FailedLoadingDynamicProcs:
-          We were unable to dynamically load one of the functions we require in
-          order to show the skeleton UI.
-        FailedGettingLock:
-          We were unable to acquire the skeleton UI lock - this should mean
-          that an existing instance of the application is already running.
-        FilesystemFailure:
-          Encountered some error getting the path to a file or reading from a
-          particular file while trying to show the skeleton UI.
-        NoStartWithLastProfile:
-          The user has set up their profiles so Firefox always shows the
-          profile manager during startup.
-        FailedRegisteringWindowClass:
-          We failed to register the window class needed to show the skeleton UI
-          window.
-        CorruptData:
-          Clearly invalid data was found when trying to load the necessary
-          information to show the skeleton UI in the right place.
-        BadWindowDimensions:
-          Window dimensions outside of the supported size for the skeleton UI.
-        FailedGettingMonitorInfo:
-          Couldn't get the monitor information when trying to display the
-          skeleton UI.
-        CreateWindowFailed:
-          The call to CreateWindow failed.
-        FailedGettingDC:
-          We failed to get the HDC to draw into.
-        FailedBlitting:
-          We failed blitting the actual skeleton UI to the HDC.
-        FailedFillingBottomRect:
-          We failed filling the solid color of the main browser below the
-          browser chrome.
-        CrashedOnce:
-          At some point the skeleton UI crashed, so we've disabled it for the
-          user.
-        Unknown:
-          An unknown error occurred - this generally should not happen.
-    expires: "98"
-    keyed: false
-    kind: string
-    notification_emails:
-      - dothayer@mozilla.com
-    release_channel_collection: opt-out
-    products:
-      - 'firefox'
-    record_in_processes:
-      - main
-
 script.preloader:
   mainthread_recompile:
     bug_numbers:

widget/windows/nsWindow.cpp

@@ -908,14 +908,6 @@ nsresult nsWindow::Create(nsIWidget* aParent, nsNativeWidget aNativeParent,
       !sFirstTopLevelWindowCreated) {
     sFirstTopLevelWindowCreated = true;
     mWnd = ConsumePreXULSkeletonUIHandle();
-    auto skeletonUIError = GetPreXULSkeletonUIErrorReason();
-    if (skeletonUIError) {
-      nsAutoString errorString(
-          GetPreXULSkeletonUIErrorString(skeletonUIError.value()));
-      Telemetry::ScalarSet(
-          Telemetry::ScalarID::STARTUP_SKELETON_UI_DISABLED_REASON,
-          errorString);
-    }
     if (mWnd) {
       MOZ_ASSERT(style == kPreXULSkeletonUIWindowStyle,
                  "The skeleton UI window style should match the expected "