Backed out 2 changesets (bug 1628346) for devtools perma failures. CLOSED TREE

Backed out changeset 1ad0f0552ed9 (bug 1628346)
Backed out changeset 4626a35ae758 (bug 1628346)

browser/app/profile/firefox.js

@@ -2138,16 +2138,7 @@ 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
-#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.

devtools/client/webconsole/constants.js

@@ -83,11 +83,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
-      CONTEXT_SELECTOR_BROWSER_TOOLBOX: "devtools.webconsole.input.context",
-      // Show the Input Context the selector in the content toolbox
-      CONTEXT_SELECTOR_CONTENT_TOOLBOX:
-        "devtools.contenttoolbox.webconsole.input.context",
+      // Show the Input Context the selector
+      CONTEXT_SELECTOR: "devtools.webconsole.input.context",
     },
     FEATURES: {
       // We use the same pref to enable the sidebar on webconsole and browser console.

devtools/client/webconsole/store.js

@@ -83,11 +83,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(
-        webConsoleUI.isBrowserToolboxConsole
-          ? PREFS.UI.CONTEXT_SELECTOR_BROWSER_TOOLBOX
-          : PREFS.UI.CONTEXT_SELECTOR_CONTENT_TOOLBOX
-      ),
+      showEvaluationContextSelector: getBoolPref(PREFS.UI.CONTEXT_SELECTOR),
     }),
   };