Backed out changeset df24976c2a46 (bug 1390359) for test_chrome_element_css.py failures a=backout

MozReview-Commit-ID: I0zHTpanBS0

browser/components/extensions/test/browser/browser_ext_identity_indication.js

@@ -4,7 +4,7 @@
 
 function confirmDefaults() {
   let identityIconURL = getComputedStyle(document.getElementById("identity-icon")).listStyleImage;
-  is(identityIconURL, "url(\"chrome://global/skin/icons/autocomplete-search.svg\")", "Identity icon should be the search icon");
+  is(identityIconURL, "url(\"chrome://browser/skin/identity-icon.svg\")", "Identity icon should be the default identity icon");
 
   let connectionIconURL = getComputedStyle(document.getElementById("connection-icon")).listStyleImage;
   is(connectionIconURL, "none", "Connection icon should not be displayed");

browser/themes/shared/identity-block/identity-block.inc.css

@@ -98,14 +98,15 @@
 #identity-box.grantedPermissions > #identity-icon {
   list-style-image: url(chrome://browser/skin/identity-icon-notice.svg);
 }
-
 #urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon {
   list-style-image: url(chrome://branding/content/identity-icons-brand.svg);
 }
-
 #urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon {
+  fill-opacity: .3;
+}
+
+#urlbar[actiontype="searchengine"] > #identity-box > #identity-icon {
   list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg);
-  fill-opacity: .4;
 }
 
 #urlbar[actiontype="extension"] > #identity-box > #identity-icon {

testing/marionette/harness/marionette_harness/tests/unit/test_chrome_element_css.py

@@ -21,7 +21,7 @@ class TestChromeElementCSS(MarionetteTestCase):
         with self.marionette.using_context("chrome"):
             identity_icon = self.marionette.find_element(By.ID, "identity-icon")
             favicon_image = identity_icon.value_of_css_property("list-style-image")
-            self.assertIn("autocomplete-search.svg", favicon_image)
+            self.assertIn("identity-icon.svg", favicon_image)
             identity_box = self.marionette.find_element(By.ID, "identity-box")
             expected_bg_colour = self.get_element_computed_style(
                 identity_box, "backgroundColor")