Bug 1633770 - Remove unnecessary loop in ContentSearchUIController._updateDefaultEngineIcon.r=Standard8

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

browser/actors/ContentSearchParent.jsm

@@ -342,7 +342,7 @@ let ContentSearch = {
         name: engine.name,
         iconData,
         hidden: hiddenList.includes(engine.name),
-        identifier: engine.identifier,
+        isAppProvided: engine.isAppProvided,
       });
     }
 
@@ -528,6 +528,7 @@ let ContentSearch = {
       name: engine.name,
       placeholder,
       iconData: await this._maybeConvertURIToArrayBuffer(favicon),
+      isAppProvided: engine.isAppProvided,
     };
     return obj;
   },

browser/base/content/contentSearchUI.js

@@ -94,6 +94,7 @@ this.ContentSearchUIController = (function() {
       this._defaultEngine = {
         name: engine.name,
         icon,
+        isAppProvided: engine.isAppProvided,
       };
       this._updateDefaultEngineHeader();
       this._updateDefaultEngineIcon();
@@ -682,13 +683,11 @@ this.ContentSearchUIController = (function() {
     },
 
     _updateDefaultEngineIcon() {
-      let eng = this._engines.find(
-        engine => engine.name === this.defaultEngine.name
-      );
       // We only show the engines icon for default engines, otherwise show
-      // a default; default engines have an identifier
-      let icon =
-        eng && eng.identifier ? this.defaultEngine.icon : DEFAULT_INPUT_ICON;
+      // a default; default engines have isAppProvided
+      let icon = this.defaultEngine.isAppProvided
+        ? this.defaultEngine.icon
+        : DEFAULT_INPUT_ICON;
       document.body.style.setProperty(
         "--newtab-search-icon",
         "url(" + icon + ")"

browser/modules/test/browser/browser_ContentSearch.js

@@ -479,7 +479,7 @@ var currentStateObj = async function(isPrivateWindowValue, hiddenEngine = "") {
       name: engine.name,
       iconData: await iconDataFromURI(uri),
       hidden: engine.name == hiddenEngine,
-      identifier: engine.identifier,
+      isAppProvided: engine.isAppProvided,
     });
   }
   if (typeof isPrivateWindowValue == "boolean") {
@@ -497,6 +497,7 @@ async function constructEngineObj(engine) {
     name: engine.name,
     placeholder: bundle.formatStringFromName("searchWithEngine", [engine.name]),
     iconData: await iconDataFromURI(uriFavicon),
+    isAppProvided: engine.isAppProvided,
   };
 }