Backed out changeset 5c2127a7d44e (bug 1688000) for gecko decision ta…

…sk complaining about browser.ini CLOSED TREE
Brli · Jan 26, 2021 · fe53a05 · fe53a05
1 parent cc163bd
commit fe53a05
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 225 deletions.
diff --git a/browser/components/urlbar/tests/ext/api.js b/browser/components/urlbar/tests/ext/api.js
@@ -13,11 +13,9 @@ const { XPCOMUtils } = ChromeUtils.import(
 XPCOMUtils.defineLazyModuleGetters(this, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
   Preferences: "resource://gre/modules/Preferences.jsm",
-  UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarProviderExtension: "resource:///modules/UrlbarProviderExtension.jsm",
   UrlbarResult: "resource:///modules/UrlbarResult.jsm",
   UrlbarView: "resource:///modules/UrlbarView.jsm",
-  UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(
@@ -75,20 +73,6 @@ this.experiments_urlbar = class extends ExtensionAPI {
               return () => provider.setEventListener("getViewUpdate", null);
             },
           }).api(),
-
-          suggestionsEnabled: async queryContext => {
-            return (
-              queryContext.sources.includes(UrlbarUtils.RESULT_SOURCE.SEARCH) &&
-              (!queryContext.restrictSource ||
-                queryContext.restrictSource ==
-                  UrlbarUtils.RESULT_SOURCE.SEARCH) &&
-              queryContext.allowSearchSuggestions &&
-              UrlbarPrefs.get("suggest.searches") &&
-              UrlbarPrefs.get("browser.search.suggest.enabled") &&
-              (!queryContext.isPrivate ||
-                UrlbarPrefs.get("browser.search.suggest.enabled.private"))
-            );
-          },
         },
       },
     };

diff --git a/browser/components/urlbar/tests/ext/browser/browser.ini b/browser/components/urlbar/tests/ext/browser/browser.ini
@@ -16,4 +16,3 @@ support-files =
   dynamicResult.css
 [browser_ext_urlbar_engagementTelemetry.js]
 [browser_ext_urlbar_extensionTimeout.js]
-[browser_ext_urlbar_suggestionsEnabled.js]
diff --git a/browser/components/urlbar/tests/ext/browser/browser_ext_urlbar_suggestionsEnabled.js b/browser/components/urlbar/tests/ext/browser/browser_ext_urlbar_suggestionsEnabled.js
diff --git a/browser/components/urlbar/tests/ext/schema.json b/browser/components/urlbar/tests/ext/schema.json
@@ -14,27 +14,6 @@
             "additionalProperties": true
           }
         }
-      },
-      {
-        "id": "Query",
-        "type": "object",
-        "description": "A UrlbarQueryContext describing the parameters of a Urlbar query.",
-        "properties": {
-          "allowAutofill": {
-            "type": "boolean"
-          },
-          "isPrivate": {
-            "type": "boolean"
-          },
-          "maxResults": {
-            "type": "number"
-          },
-          "searchString": {
-            "type": "string"
-          }
-        },
-        "additionalProperties": true,
-        "required": ["allowAutofill", "isPrivate", "maxResults", "searchString"]
       }
     ],
     "properties": {
@@ -128,23 +107,6 @@
         "async": true,
         "description": "Sets urlbar.value to the empty string and the pageproxystate to invalid.",
         "parameters": []
-      },
-      {
-        "name": "suggestionsEnabled",
-        "type": "function",
-        "async": true,
-        "description": "Determine whether suggestions should be shown or not.",
-        "parameters": [
-          {
-            "name": "queryContext",
-            "$ref": "Query",
-            "description": "The UrlbarQueryContext for the active query."
-          }
-        ],
-        "returns": {
-          "type": "boolean",
-          "description": "True if suggestions are enabled in the current context."
-        }
       }
     ]
   }

diff --git a/testing/extensions/moz.build b/testing/extensions/moz.build
@@ -2,6 +2,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-BROWSER_CHROME_MANIFESTS += [
-    'tests/browser/browser.ini',
-]
+# This file will be overwritten when adding custom extension tests.