diff -r 000000000000 -r 6474c204b198 browser/components/safebrowsing/content/test/browser_bug400731.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/components/safebrowsing/content/test/browser_bug400731.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,49 @@
+/* Check for the intended visibility of the "Ignore this warning" text*/
+
+function test() {
+  waitForExplicitFinish();
+  
+  gBrowser.selectedTab = gBrowser.addTab();
+  
+  // Navigate to malware site.  Can't use an onload listener here since
+  // error pages don't fire onload.  Also can't register the DOMContentLoaded
+  // handler here because registering it too soon would mean that we might
+  // get it for about:blank, and not about:blocked.
+  gBrowser.addTabsProgressListener({
+    onLocationChange: function(aTab, aWebProgress, aRequest, aLocation, aFlags) {
+      if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_ERROR_PAGE) {
+        gBrowser.removeTabsProgressListener(this);
+        window.addEventListener("DOMContentLoaded", testMalware, true);
+      }
+    }
+  });
+  content.location = "http://www.itisatrap.org/firefox/its-an-attack.html";
+}
+
+function testMalware() {
+  window.removeEventListener("DOMContentLoaded", testMalware, true);
+
+  // Confirm that "Ignore this warning" is visible - bug 422410
+  var el = content.document.getElementById("ignoreWarningButton");
+  ok(el, "Ignore warning button should be present for malware");
+  
+  var style = content.getComputedStyle(el, null);
+  is(style.display, "inline-block", "Ignore Warning button should be display:inline-block for malware");
+  
+  // Now launch the phishing test
+  window.addEventListener("DOMContentLoaded", testPhishing, true);
+  content.location = "http://www.itisatrap.org/firefox/its-a-trap.html";
+}
+
+function testPhishing() {
+  window.removeEventListener("DOMContentLoaded", testPhishing, true);
+  
+  var el = content.document.getElementById("ignoreWarningButton");
+  ok(el, "Ignore warning button should be present for phishing");
+  
+  var style = content.getComputedStyle(el, null);
+  is(style.display, "inline-block", "Ignore Warning button should be display:inline-block for phishing");
+  
+  gBrowser.removeCurrentTab();
+  finish();
+}