Bug 1698237 - Backed out changeset 18909220355a (bug 1697806).

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

browser/base/content/test/webextensions/head.js

@@ -182,7 +182,13 @@ function triggerPageOptionsAction(win, action) {
 }
 
 function isDefaultIcon(icon) {
-  return icon == "chrome://mozapps/skin/extensions/extensionGeneric.svg";
+  // These are basically the same icon, but code within webextensions
+  // generates references to the former and generic add-ons manager code
+  // generates referces to the latter.
+  return (
+    icon == "chrome://browser/content/extension.svg" ||
+    icon == "chrome://mozapps/skin/extensions/extensionGeneric.svg"
+  );
 }
 
 /**

browser/components/extensions/extension.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="64" height="64" viewBox="0 0 64 64">
+  <defs>
+    <style>
+      .style-puzzle-piece {
+        fill: url('#gradient-linear-puzzle-piece');
+      }
+    </style>
+    <linearGradient id="gradient-linear-puzzle-piece" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0%" stop-color="#66cc52" stop-opacity="1"/>
+      <stop offset="100%" stop-color="#60bf4c" stop-opacity="1"/>
+    </linearGradient>
+  </defs>
+  <path class="style-puzzle-piece" d="M42,62c2.2,0,4-1.8,4-4l0-14.2c0,0,0.4-3.7,2.8-3.7c2.4,0,2.2,3.9,6.7,3.9c2.3,0,6.2-1.2,6.2-8.2 c0-7-3.9-7.9-6.2-7.9c-4.5,0-4.3,3.7-6.7,3.7c-2.4,0-2.8-3.8-2.8-3.8V22c0-2.2-1.8-4-4-4H31.5c0,0-3.4-0.6-3.4-3 c0-2.4,3.8-2.6,3.8-7.1c0-2.3-1.3-5.9-8.3-5.9s-8,3.6-8,5.9c0,4.5,3.4,4.7,3.4,7.1c0,2.4-3.4,3-3.4,3H6c-2.2,0-4,1.8-4,4l0,7.8 c0,0-0.4,6,4.4,6c3.1,0,3.2-4.1,7.3-4.1c2,0,4,1.9,4,6c0,4.2-2,6.3-4,6.3c-4,0-4.2-4.1-7.3-4.1c-4.8,0-4.4,5.8-4.4,5.8L2,58 c0,2.2,1.8,4,4,4H19c0,0,6.3,0.4,6.3-4.4c0-3.1-4-3.6-4-7.7c0-2,2.2-4.5,6.4-4.5c4.2,0,6.6,2.5,6.6,4.5c0,4-3.9,4.6-3.9,7.7 c0,4.9,6.3,4.4,6.3,4.4H42z"/>
+</svg>

browser/components/extensions/jar.mn

@@ -11,6 +11,7 @@ browser.jar:
 #ifdef XP_WIN
     content/browser/extension-win-panel.css
 #endif
+    content/browser/extension.svg
     content/browser/ext-browser.json
     content/browser/parent/ext-bookmarks.js (parent/ext-bookmarks.js)
     content/browser/parent/ext-browser.js (parent/ext-browser.js)

browser/components/extensions/test/browser/browser_ext_browserAction_context.js

@@ -563,7 +563,7 @@ add_task(async function testPropertyRemoval() {
     },
 
     getTests: function(tabs, windows) {
-      let defaultIcon = "chrome://mozapps/skin/extensions/extensionGeneric.svg";
+      let defaultIcon = "chrome://browser/content/extension.svg";
       let details = [
         {
           icon: browser.runtime.getURL("default.png"),

browser/components/extensions/test/browser/browser_ext_browserAction_pageAction_icon.js

@@ -365,7 +365,7 @@ add_task(async function testDetailsObjects() {
   await promiseAnimationFrame();
 
   // The initial icon should be the default icon since no icon is in the manifest.
-  const DEFAULT_ICON = "chrome://mozapps/skin/extensions/extensionGeneric.svg";
+  const DEFAULT_ICON = "chrome://browser/content/extension.svg";
   let browserActionButton = browserActionWidget.forWindow(window).node;
   let pageActionImage = document.getElementById(pageActionId);
   is(

browser/components/extensions/test/browser/browser_ext_pageAction_context.js

@@ -51,7 +51,7 @@ add_task(async function testTabSwitchContext() {
     },
 
     getTests: function(tabs) {
-      let defaultIcon = "chrome://mozapps/skin/extensions/extensionGeneric.svg";
+      let defaultIcon = "chrome://browser/content/extension.svg";
       let details = [
         {
           icon: browser.runtime.getURL("default.png"),

browser/components/extensions/test/browser/browser_ext_sidebarAction_context.js

@@ -431,7 +431,7 @@ add_task(async function testPropertyRemoval() {
     },
 
     getTests: function(tabs, windows) {
-      let defaultIcon = "chrome://mozapps/skin/extensions/extensionGeneric.svg";
+      let defaultIcon = "chrome://browser/content/extension.svg";
       let details = [
         {
           icon: browser.runtime.getURL("default.png"),

browser/components/urlbar/UrlbarUtils.jsm

@@ -147,7 +147,7 @@ var UrlbarUtils = {
   // This defines icon locations that are commonly used in the UI.
   ICON: {
     // DEFAULT is defined lazily so it doesn't eagerly initialize PlacesUtils.
-    EXTENSION: "chrome://mozapps/skin/extensions/extensionGeneric.svg",
+    EXTENSION: "chrome://browser/content/extension.svg",
     HISTORY: "chrome://browser/skin/history.svg",
     SEARCH_GLASS: "chrome://global/skin/icons/search-glass.svg",
     SEARCH_GLASS_INVERTED: "chrome://browser/skin/search-glass-inverted.svg",

browser/themes/shared/notification-icons.inc.css

@@ -299,7 +299,7 @@ html|*#webRTC-previewVideo {
 }
 
 .popup-notification-icon[popupid="addon-install-confirmation"] {
-  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.svg);
+  list-style-image: url(chrome://browser/content/extension.svg);
 }
 
 #addon-install-confirmation-notification[warning] .popup-notification-icon[popupid="addon-install-confirmation"] {

toolkit/components/extensions/ExtensionParent.jsm

@@ -1555,7 +1555,7 @@ function watchExtensionProxyContextLoad(
 // Manages icon details for toolbar buttons in the |pageAction| and
 // |browserAction| APIs.
 let IconDetails = {
-  DEFAULT_ICON: "chrome://mozapps/skin/extensions/extensionGeneric.svg",
+  DEFAULT_ICON: "chrome://browser/content/extension.svg",
 
   // WeakMap<Extension -> Map<url-string -> Map<iconType-string -> object>>>
   iconCache: new DefaultWeakMap(() => {
@@ -1675,7 +1675,7 @@ let IconDetails = {
   // Returns the appropriate icon URL for the given icons object and the
   // screen resolution of the given window.
   getPreferredIcon(icons, extension = null, size = 16) {
-    const DEFAULT = "chrome://mozapps/skin/extensions/extensionGeneric.svg";
+    const DEFAULT = "chrome://browser/content/extension.svg";
 
     let bestSize = null;
     if (icons[size]) {