Bug 1374104 - Remove chrome://browser/skin/search-history-icon.svg in favor of the context-fill using chrome://browser/skin/history.svg. r=johannh

MozReview-Commit-ID: 6AJ8CH8KOjW

browser/base/content/contentSearchUI.css

@@ -51,11 +51,13 @@
   width: 16px;
   height: 16px;
   display: inline-block;
-  background-image: url("chrome://browser/skin/search-history-icon.svg#search-history-icon");
+  background-image: url("chrome://browser/skin/history.svg");
+  -moz-context-properties: fill;
+  fill: graytext;
 }
 
 .contentSearchSuggestionRow.selected > td > .historyIcon {
-  background-image: url("chrome://browser/skin/search-history-icon.svg#search-history-icon-active");
+  fill: HighlightText;
 }
 
 .contentSearchHeader > img {

browser/themes/linux/searchbar.css

@@ -319,11 +319,13 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 }
 
 .search-panel-tree > .autocomplete-treebody::-moz-tree-image(fromhistory) {
-  list-style-image: url("chrome://browser/skin/search-history-icon.svg#search-history-icon");
+  list-style-image: url("chrome://browser/skin/history.svg");
+  -moz-context-properties: fill;
+  fill: graytext;
 }
 
 .search-panel-tree > .autocomplete-treebody::-moz-tree-image(fromhistory, selected) {
-  list-style-image: url("chrome://browser/skin/search-history-icon.svg#search-history-icon-active");
+  fill: HighlightText;
 }
 
 .search-setting-button {

browser/themes/osx/searchbar.css

@@ -298,11 +298,13 @@
 }
 
 .search-panel-tree > .autocomplete-treebody::-moz-tree-image(fromhistory) {
-  list-style-image: url("chrome://browser/skin/search-history-icon.svg#search-history-icon");
+  list-style-image: url("chrome://browser/skin/history.svg");
+  -moz-context-properties: fill;
+  fill: graytext;
 }
 
 .search-panel-tree > .autocomplete-treebody::-moz-tree-image(fromhistory, selected) {
-  list-style-image: url("chrome://browser/skin/search-history-icon.svg#search-history-icon-active");
+  fill: HighlightText;
 }
 
 #PopupSearchAutoComplete {

browser/themes/shared/jar.inc.mn

@@ -170,7 +170,6 @@
   skin/classic/browser/badge-add-engine@2x.png                 (../shared/search/badge-add-engine@2x.png)
   skin/classic/browser/search-indicator-badge-add.png          (../shared/search/search-indicator-badge-add.png)
   skin/classic/browser/search-indicator-badge-add@2x.png       (../shared/search/search-indicator-badge-add@2x.png)
-  skin/classic/browser/search-history-icon.svg                 (../shared/search/history-icon.svg)
   skin/classic/browser/search-indicator-magnifying-glass.svg   (../shared/search/search-indicator-magnifying-glass.svg)
   skin/classic/browser/search-arrow-go.svg                     (../shared/search/search-arrow-go.svg)
   skin/classic/browser/gear.svg                                (../shared/search/gear.svg)

browser/themes/shared/search/history-icon.svg

@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!-- 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="16" height="16" viewBox="0 0 16 16">
-  <style>
-    use:not(:target) {
-      display: none;
-    }
-    use {
-      fill: graytext;
-    }
-    use[id$="-active"] {
-      fill: HighlightText;
-    }
-  </style>
-  <defs>
-    <path id="search-history-glyph" d="M8,1C4.1,1,1,4.1,1,8c0,3.9,3.1,7,7,7c3.9,0,7-3.1,7-7 C15,4.1,11.9,1,8,1z M8,13.3c-2.9,0-5.3-2.4-5.3-5.3S5.1,2.7,8,2.7c2.9,0,5.3,2.4,5.3,5.3S10.9,13.3,8,13.3z M10.5,7H9V5 c0-0.6-0.4-1-1-1S7,4.4,7,5v3c0,0.6,0.4,1,1,1h2.5c0.6,0,1-0.4,1-1C11.5,7.4,11.1,7,10.5,7z"/>
-  </defs>
-  <use id="search-history-icon" xlink:href="#search-history-glyph"/>
-  <use id="search-history-icon-active" xlink:href="#search-history-glyph"/>
-</svg>

browser/themes/windows/searchbar.css

@@ -316,11 +316,13 @@
 }
 
 .search-panel-tree > .autocomplete-treebody::-moz-tree-image(fromhistory) {
-  list-style-image: url("chrome://browser/skin/search-history-icon.svg#search-history-icon");
+  list-style-image: url("chrome://browser/skin/history.svg");
+  -moz-context-properties: fill;
+  fill: graytext;
 }
 
 .search-panel-tree > .autocomplete-treebody::-moz-tree-image(fromhistory, selected) {
-  list-style-image: url("chrome://browser/skin/search-history-icon.svg#search-history-icon-active");
+  fill: HighlightText;
 }
 
 .search-setting-button {