Bug 1938102 - Enable actions mode properly and reenable tests r=daisuke

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

browser/components/preferences/search.js

@@ -1195,7 +1195,7 @@ class EngineView {
   // nsITreeView
   get rowCount() {
     let localModes = UrlbarUtils.LOCAL_SEARCH_MODES;
-    if (lazy.UrlbarPrefs.get("scotchBonnet.enableOverride")) {
+    if (!lazy.UrlbarPrefs.get("scotchBonnet.enableOverride")) {
       localModes = localModes.filter(
         mode => mode.source != UrlbarUtils.RESULT_SOURCE.ACTIONS
       );

browser/components/preferences/tests/browser_localSearchShortcuts.js

@@ -18,9 +18,6 @@ const isRestrictKeywordsFeatureOn = () =>
   UrlbarPrefs.getScotchBonnetPref("searchRestrictKeywords.featureGate");
 
 add_setup(async function () {
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
-  });
   let prefs = await openPreferencesViaOpenPreferencesAPI("search", {
     leaveOpen: true,
   });
@@ -321,12 +318,6 @@ async function forEachLocalShortcutRow(callback) {
   for (let i = 0; i < UrlbarUtils.LOCAL_SEARCH_MODES.length; i++) {
     let shortcut = UrlbarUtils.LOCAL_SEARCH_MODES[i];
     let row = engines.length + i;
-    // These tests assume LOCAL_SEARCH_MODES are enabled, this can be removed
-    // when we enable QuickActions. We cant just enable the pref in browser.ini
-    // as this test calls clearUserPref.
-    if (shortcut.pref == "shortcuts.actions") {
-      continue;
-    }
     await callback(row, shortcut);
   }
 }

browser/components/preferences/tests/browser_searchRestoreDefaults.js

@@ -8,10 +8,6 @@ const { SearchUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/SearchUtils.sys.mjs"
 );
 add_task(async function test_restore_functionality() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.urlbar.scotchBonnet.enableOverride", false]],
-  });
-
   // Ensure no engines are hidden to begin with.
   for (let engine of await Services.search.getAppProvidedEngines()) {
     if (engine.hidden) {

browser/components/urlbar/UrlbarPrefs.sys.mjs

@@ -392,7 +392,7 @@ const PREF_URLBAR_DEFAULTS = new Map([
   ["shortcuts.bookmarks", true],
   ["shortcuts.tabs", true],
   ["shortcuts.history", true],
-  ["shortcuts.actions", false],
+  ["shortcuts.actions", true],
 
   // Boolean to determine if the providers defined in `exposureResults`
   // should be displayed in search results. This can be set by a
@@ -1595,7 +1595,7 @@ class Preferences {
   _getPrefValue(pref) {
     switch (pref) {
       case "shortcuts.actions": {
-        return this.get("scotchBonnet.enableOverride") || this._readPref(pref);
+        return this.get("scotchBonnet.enableOverride") && this._readPref(pref);
       }
       case "defaultBehavior": {
         let val = 0;