Back out bug 383183 due to unit test failures and perf regression

browser/components/safebrowsing/content/phishing-afterload-displayer.js

@@ -208,6 +208,7 @@ PROT_PhishMsgDisplayerBase.prototype.browserSelected = function() {
     this.messageShouldShow_ = true;
   }
 
+  this.hideLockIcon_();        // Comes back when we are unselected or unloaded
   this.addWarningInUrlbar_();  // Goes away when we are unselected or unloaded
 
   // messageShouldShow might be false if the user dismissed the warning, 
@@ -233,6 +234,7 @@ PROT_PhishMsgDisplayerBase.prototype.explicitShow = function() {
  */
 PROT_PhishMsgDisplayerBase.prototype.browserUnselected = function() {
   this.removeWarningInUrlbar_();
+  this.unhideLockIcon_();
   if (this.messageShowing_)
     this.hideMessage_();
 }
@@ -288,6 +290,7 @@ PROT_PhishMsgDisplayerBase.prototype.done = function() {
     // If we were started, we must be the current problem, so these things
     // must be showing
     this.removeWarningInUrlbar_();
+    this.unhideLockIcon_();
 
     // Could be though that they've closed the warning dialog
     if (this.messageShowing_)
@@ -324,6 +327,28 @@ PROT_PhishMsgDisplayerBase.prototype.removeIfExists_ = function(orig,
   return orig;
 }
 
+/**
+ * We don't want to confuse users if they land on a phishy page that uses
+ * SSL, so ensure that the lock icon never shows when we're showing our 
+ * warning.
+ */
+PROT_PhishMsgDisplayerBase.prototype.hideLockIcon_ = function() {
+  var lockIcon = this.doc_.getElementById("lock-icon");
+  if (!lockIcon)
+    return;
+  lockIcon.hidden = true;
+}
+
+/**
+ * Ensure they can see it after our warning is finished.
+ */
+PROT_PhishMsgDisplayerBase.prototype.unhideLockIcon_ = function() {
+  var lockIcon = this.doc_.getElementById("lock-icon");
+  if (!lockIcon)
+    return;
+  lockIcon.hidden = false;
+}
+
 /**
  * This method makes our warning icon visible in the location bar. It will
  * be removed only when the problematic document is navigated awy from