Revert 47347 - (Original patch reviewed at http://codereview.chromium.org/2067003 )

Track "display" and "run" separately for mixed content, and make the latter downgrade the SSL state to "authentication broken".

Make the "display" state only affect the current tab (not the entire host).

Fix an SSL browser test by supplying the appropriate SiteInstance*.

Move a test from "disabled" to "flaky" since it at least passes for me.

Make the SSLManager header and .cc files put functions in the same order, and make that order somewhat saner.


Falied TestGoodFrameNavigation on Mac 10.5 browser tests

among other things:
/b/slave/chromium-rel-mac-builder/build/src/chrome/browser/ssl/ssl_browser_tests.cc:43: Failure
Value of: entry->ssl().displayed_mixed_content()
  Actual: false
Expected: displayed_mixed_content
Which is: true


BUG=15072, 18626, 40932, 42758
TEST=Covered by browser tests
Review URL: http://codereview.chromium.org/2063008

TBR=pkasting@chromium.org
Review URL: http://codereview.chromium.org/2095006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47357 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 7 deletions

diff --git a/chrome/common/notification_type.h b/chrome/common/notification_type.h
index f6fc5f1..ec2a858 100644
--- a/chrome/common/notification_type.h
+++ b/chrome/common/notification_type.h
@@ -131,15 +131,16 @@ class NotificationType {
     // Updating the SSL security indicators (the lock icon and such) proceeds
     // in two phases:
     //
-    // 1) The internal SSL state for a host or tab changes.  When this happens,
-    //    the SSLManager broadcasts an SSL_INTERNAL_STATE_CHANGED notification.
+    // 1) An SSLManager changes the SSLHostState (which hangs off the profile
+    //    object).  When this happens, the SSLManager broadcasts an
+    //    SSL_INTERNAL_STATE_CHANGED notification.
     //
     // 2) The SSLManager for each tab receives this notification and might or
     //    might not update the navigation entry for its tab, depending on
-    //    whether the change in state affects that tab.  If the SSLManager does
-    //    change the navigation entry, then the SSLManager broadcasts an
-    //    SSL_VISIBLE_STATE_CHANGED notification to the user interface can
-    //    redraw properly.
+    //    whether the change in SSLHostState affects that tab.  If the
+    //    SSLManager does change the navigation entry, then the SSLManager
+    //    broadcasts an SSL_VISIBLE_STATE_CHANGED notification to the user
+    //    interface can redraw properly.
 
     // The SSL state of a page has changed in some visible way.  For example,
     // if an insecure resource is loaded on a secure page.  Note that a
@@ -148,7 +149,9 @@ class NotificationType {
     // case.  Listen to this notification if you need to refresh SSL-related UI
     // elements.
     //
-    // There is no source or details.
+    // The source will be the navigation controller associated with the load.
+    // There are no details.  The entry changed will be the active entry of the
+    // controller.
     SSL_VISIBLE_STATE_CHANGED,
 
     // The SSL state of the browser has changed in some internal way.  For