From c23ab24dbdfd2966cb46f13e4efa1557f34413b8 Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Mon, 15 Apr 2024 15:05:57 +0000
Subject: [PATCH] Bug 1845037 - [devtools] Revert DevTools screenshots to use
 the default downloads directory r=devtools-reviewers,ochameau

Revert the DevTools bits from Bug 1072345 to be consistent with the Screenshots feature from Firefox.

Differential Revision: https://phabricator.services.mozilla.com/D207413
---
 devtools/client/shared/screenshot.js               | 14 ++++----------
 .../browser_jsterm_screenshot_command_file.js      | 14 ++++----------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/devtools/client/shared/screenshot.js b/devtools/client/shared/screenshot.js
index ca746f66e767..4031708293f6 100644
--- a/devtools/client/shared/screenshot.js
+++ b/devtools/client/shared/screenshot.js
@@ -327,9 +327,9 @@ function saveToClipboard(base64URI) {
 let _outputDirectory = null;
 
 /**
- * Returns the default directory for screenshots.
- * If a specific directory for screenshots is not defined,
- * it falls back to the system downloads directory.
+ * Returns the default directory for DevTools screenshots.
+ * For consistency with the Firefox Screenshots feature, this will default to
+ * the preferred downloads directory.
  *
  * @return {Promise<String>} Resolves the path as a string
  */
@@ -338,13 +338,7 @@ async function getOutputDirectory() {
     return _outputDirectory;
   }
 
-  try {
-    // This will throw if there is not a screenshot directory set for the platform
-    _outputDirectory = Services.dirsvc.get("Scrnshts", Ci.nsIFile).path;
-  } catch (e) {
-    _outputDirectory = await lazy.Downloads.getPreferredDownloadsDirectory();
-  }
-
+  _outputDirectory = await lazy.Downloads.getPreferredDownloadsDirectory();
   return _outputDirectory;
 }
 
diff --git a/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_file.js b/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_file.js
index f872745bbdc9..09e17594abd9 100644
--- a/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_file.js
+++ b/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_file.js
@@ -97,16 +97,10 @@ add_task(async function () {
   const dayString = date.getDate().toString().padStart(2, "0");
   const expectedDateString = `${date.getFullYear()}-${monthString}-${dayString}`;
 
-  let screenshotDir;
-  try {
-    // This will throw if there is not a screenshot directory set for the platform
-    screenshotDir = Services.dirsvc.get("Scrnshts", Ci.nsIFile).path;
-  } catch (e) {
-    const { Downloads } = ChromeUtils.importESModule(
-      "resource://gre/modules/Downloads.sys.mjs"
-    );
-    screenshotDir = await Downloads.getPreferredDownloadsDirectory();
-  }
+  const { Downloads } = ChromeUtils.importESModule(
+    "resource://gre/modules/Downloads.sys.mjs"
+  );
+  const screenshotDir = await Downloads.getPreferredDownloadsDirectory();
 
   const { renderedDate, filePath } =
     /Saved to (?<filePath>.*Screen Shot (?<renderedDate>\d{4}-\d{2}-\d{2}) at \d{2}.\d{2}.\d{2}\.png)/.exec(