Bug 1605330 - [devtools] Enable context selector on Nightly. r=ochameau.

We take this opportunity to merge the browser toolbox and content toolbox preferences
into a single one.

Depends on D131600

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

browser/app/profile/firefox.js

@@ -2464,16 +2464,13 @@ pref("devtools.webconsole.filter.netxhr", false);
 // Webconsole autocomplete preference
 pref("devtools.webconsole.input.autocomplete",true);
 
-// Show context selector in console input, in the browser toolbox
+// Show context selector in console input
 #if defined(NIGHTLY_BUILD)
   pref("devtools.webconsole.input.context", true);
 #else
   pref("devtools.webconsole.input.context", false);
 #endif
 
-// Show context selector in console input, in the content toolbox
-pref("devtools.contenttoolbox.webconsole.input.context", false);
-
 // Set to true to eagerly show the results of webconsole terminal evaluations
 // when they don't have side effects.
 pref("devtools.webconsole.input.eagerEvaluation", true);

devtools/client/webconsole/constants.js

@@ -84,11 +84,8 @@ const prefs = {
       EDITOR_WIDTH: "input.editorWidth",
       // Show the Editor onboarding UI
       EDITOR_ONBOARDING: "devtools.webconsole.input.editorOnboarding",
-      // Show the Input Context the selector in the browser toolbox
+      // Show the Input Context the selector
-      CONTEXT_SELECTOR_BROWSER_TOOLBOX: "devtools.webconsole.input.context",
+      CONTEXT_SELECTOR: "devtools.webconsole.input.context",
-      // Show the Input Context the selector in the content toolbox
-      CONTEXT_SELECTOR_CONTENT_TOOLBOX:
-        "devtools.contenttoolbox.webconsole.input.context",
     },
     FEATURES: {
       // We use the same pref to enable the sidebar on webconsole and browser console.

devtools/client/webconsole/store.js

@@ -81,11 +81,7 @@ function configureStore(webConsoleUI, options = {}) {
       editorWidth: getIntPref(PREFS.UI.EDITOR_WIDTH),
       showEditorOnboarding: getBoolPref(PREFS.UI.EDITOR_ONBOARDING),
       timestampsVisible: getBoolPref(PREFS.UI.MESSAGE_TIMESTAMP),
-      showEvaluationContextSelector: getBoolPref(
+      showEvaluationContextSelector: getBoolPref(PREFS.UI.CONTEXT_SELECTOR),
-        webConsoleUI.isBrowserToolboxConsole
-          ? PREFS.UI.CONTEXT_SELECTOR_BROWSER_TOOLBOX
-          : PREFS.UI.CONTEXT_SELECTOR_CONTENT_TOOLBOX
-      ),
     }),
   };
 

devtools/client/webconsole/test/browser/browser_jsterm_evaluation_context_selector.js

@@ -11,7 +11,7 @@ const IFRAME_PATH = `${FILE_FOLDER}/test-console-evaluation-context-selector-chi
 requestLongerTimeout(2);
 
 add_task(async function() {
-  await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
+  await pushPref("devtools.webconsole.input.context", true);
 
   const hud = await openNewTabWithIframesAndConsole(TEST_URI, [
     `https://example.org/${IFRAME_PATH}?id=iframe-1`,

devtools/client/webconsole/test/browser/browser_jsterm_evaluation_context_selector_iframe_picker.js

@@ -17,7 +17,7 @@ const TEST_URI = `https://example.com/document-builder.sjs?html=${encodeURICompo
 
 add_task(async function() {
   // Enable the context selector and the frames button.
-  await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
+  await pushPref("devtools.webconsole.input.context", true);
   await pushPref("devtools.command-button-frames.enabled", true);
 
   const hud = await openNewTabAndConsole(TEST_URI);

devtools/client/webconsole/test/browser/browser_jsterm_evaluation_context_selector_inspector.js

@@ -20,7 +20,7 @@ Services.scriptloader.loadSubScript(
 requestLongerTimeout(2);
 
 add_task(async function() {
-  await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
+  await pushPref("devtools.webconsole.input.context", true);
 
   const hud = await openNewTabWithIframesAndConsole(TEST_URI, [
     `https://example.org/${IFRAME_PATH}?id=iframe-1`,

devtools/client/webconsole/test/browser/browser_jsterm_evaluation_context_selector_pause_in_debugger.js

@@ -12,7 +12,7 @@ const TEST_URI = `${URL_ROOT_COM_SSL}test-console-evaluation-context-selector.ht
 const IFRAME_FILE = `test-console-evaluation-context-selector-child.html`;
 
 add_task(async function() {
-  await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
+  await pushPref("devtools.webconsole.input.context", true);
 
   const tab = await addTab(TEST_URI);
 

devtools/client/webconsole/test/browser/browser_jsterm_evaluation_context_selector_targets_update.js

@@ -12,7 +12,7 @@ const IFRAME_PATH = `${FILE_FOLDER}/test-console-evaluation-context-selector-chi
 // the context is set to the top one if the destroyed target was selected).
 
 add_task(async function() {
-  await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
+  await pushPref("devtools.webconsole.input.context", true);
 
   const hud = await openNewTabWithIframesAndConsole(TEST_URI, [
     `https://example.net/${IFRAME_PATH}?id=iframe-1`,

devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_selector.js

@@ -18,7 +18,7 @@ const { FileUtils } = ChromeUtils.import(
 const dpr = "--dpr 1";
 
 add_task(async function() {
-  await pushPref("devtools.contenttoolbox.webconsole.input.context", true);
+  await pushPref("devtools.webconsole.input.context", true);
 
   const hud = await openNewTabAndConsole(TEST_URI);
 

devtools/client/webconsole/test/node/mocha-test-setup.js

@@ -38,7 +38,6 @@ pref("devtools.browserconsole.contentMessages", true);
 pref("devtools.webconsole.input.editorWidth", 800);
 pref("devtools.webconsole.input.editorOnboarding", true);
 pref("devtools.webconsole.input.context", false);
-pref("devtools.contenttoolbox.webconsole.input.context", false);
 
 global.loader = {
   lazyServiceGetter: () => {},