Bug 1544864 - Enable Show Content Messages in browser console. r=bgrins.

This patch removes the preference we were using to
display the checkbox in the Browser Console; it's now
always displayed there.

We flip the pref to show content messages ini tests that need them.

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

--HG--
extra : moz-landing-system : lando

devtools/client/preferences/devtools-client.js

@@ -289,8 +289,6 @@ pref("devtools.performance.new-panel-enabled", false);
 // Enable message grouping in the console, false by default
 pref("devtools.webconsole.groupWarningMessages", false);
 
-// Enable Content messages filtering in the browser console.
-pref("devtools.browserconsole.filterContentMessages", false);
 // Saved state of the Display content messages checkbox in the browser console.
 pref("devtools.browserconsole.contentMessages", false);
 

devtools/client/webconsole/constants.js

@@ -80,7 +80,6 @@ const prefs = {
       JSTERM_CODE_MIRROR: "devtools.webconsole.jsterm.codeMirror",
       AUTOCOMPLETE: "devtools.webconsole.input.autocomplete",
       GROUP_WARNINGS: "devtools.webconsole.groupWarningMessages",
-      FILTER_CONTENT_MESSAGES: "devtools.browserconsole.filterContentMessages",
     },
   },
 };

devtools/client/webconsole/reducers/prefs.js

@@ -14,7 +14,6 @@ const PrefState = (overrides) => Object.freeze(Object.assign({
   sidebarToggle: false,
   jstermCodeMirror: false,
   groupWarnings: false,
-  filterContentMessages: false,
   historyCount: 50,
 }, overrides));
 

devtools/client/webconsole/store.js

@@ -52,7 +52,6 @@ function configureStore(webConsoleUI, options = {}) {
   const autocomplete = getBoolPref(PREFS.FEATURES.AUTOCOMPLETE);
   const groupWarnings = getBoolPref(PREFS.FEATURES.GROUP_WARNINGS);
   const historyCount = getIntPref(PREFS.UI.INPUT_HISTORY_COUNT);
-  const filterContentMessages = getBoolPref(PREFS.FEATURES.FILTER_CONTENT_MESSAGES);
 
   const initialState = {
     prefs: PrefState({
@@ -62,7 +61,6 @@ function configureStore(webConsoleUI, options = {}) {
       autocomplete,
       historyCount,
       groupWarnings,
-      filterContentMessages,
     }),
     filters: FilterState({
       error: getBoolPref(PREFS.FILTER.ERROR),
@@ -77,7 +75,7 @@ function configureStore(webConsoleUI, options = {}) {
     ui: UiState({
       networkMessageActiveTabId: "headers",
       persistLogs: getBoolPref(PREFS.UI.PERSIST),
-      showContentMessages: webConsoleUI.isBrowserConsole && filterContentMessages
+      showContentMessages: webConsoleUI.isBrowserConsole
         ? getBoolPref(PREFS.UI.CONTENT_MESSAGES)
         : true,
       editor: getBoolPref(PREFS.UI.EDITOR),

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

@@ -28,7 +28,6 @@ pref("devtools.webconsole.groupWarningMessages", false);
 pref("devtools.webconsole.input.editor", false);
 pref("devtools.webconsole.input.autocomplete", true);
 pref("devtools.browserconsole.contentMessages", true);
-pref("devtools.browserconsole.filterContentMessages", false);
 
 global.loader = {
   lazyServiceGetter: () => {},

devtools/client/webconsole/test/mochitest/browser_console_clear_cache.js

@@ -9,6 +9,7 @@
 const TEST_URI = "data:text/html;charset=utf8,Test browser console clear cache";
 
 add_task(async function() {
+  await pushPref("devtools.browserconsole.contentMessages", true);
   await addTab(TEST_URI);
   let hud = await HUDService.toggleBrowserConsole();
   const CACHED_MESSAGE = "CACHED_MESSAGE";

devtools/client/webconsole/test/mochitest/browser_console_context_menu_entries.js

@@ -9,6 +9,7 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/mochitest/test-console.html";
 
 add_task(async function() {
+  await pushPref("devtools.browserconsole.contentMessages", true);
   // Enable net messages in the console for this test.
   await pushPref("devtools.browserconsole.filter.net", true);
   // This is required for testing the text input in the browser console:

devtools/client/webconsole/test/mochitest/browser_console_error_source_click.js

@@ -12,6 +12,7 @@ const TEST_URI = "data:text/html;charset=utf8,<p>hello world" +
                  "<button onclick='foobar.explode()'>click!</button>";
 
 add_task(async function() {
+  await pushPref("devtools.browserconsole.contentMessages", true);
   await addTab(TEST_URI);
 
   const hud = await HUDService.toggleBrowserConsole();

devtools/client/webconsole/test/mochitest/browser_console_webconsole_console_api_calls.js

@@ -31,9 +31,6 @@ const TEST_URI = `data:text/html,<meta charset=utf8>console API calls<script>
 </script>`;
 
 add_task(async function() {
-  // Enable the checkbox
-  await pushPref("devtools.browserconsole.filterContentMessages", true);
-
   // Show the content messages
   await pushPref("devtools.browserconsole.contentMessages", true);
 

devtools/client/webconsole/test/mochitest/browser_console_webconsole_private_browsing.js

@@ -26,6 +26,7 @@ const PRIVATE_TEST_URI = `data:text/html;charset=utf8,Test console in private wi
   </script>`;
 
 add_task(async function() {
+  await pushPref("devtools.browserconsole.contentMessages", true);
   await addTab(NON_PRIVATE_TEST_URI);
 
   const privateWindow = await openNewBrowserWindow({ private: true });

devtools/client/webconsole/webconsole-wrapper.js

@@ -390,8 +390,7 @@ class WebConsoleWrapper {
         closeSplitConsole: this.closeSplitConsole.bind(this),
         jstermCodeMirror,
         autocomplete,
-        hideShowContentMessagesCheckbox: !webConsoleUI.isBrowserConsole ||
-          !prefs.filterContentMessages,
+        hideShowContentMessagesCheckbox: !webConsoleUI.isBrowserConsole,
       });
 
       // Render the root Application component.