Reland r47347 [was reverted in r47357], this time without re-enabling a DISABLED test that times out on Mac. (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.

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

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

1 files changed, 7 insertions, 10 deletions

diff --git a/chrome/common/notification_type.h b/chrome/common/notification_type.h
index 7e17a68..418ce97 100644
--- a/chrome/common/notification_type.h
+++ b/chrome/common/notification_type.h
@@ -131,16 +131,15 @@ class NotificationType {
     // Updating the SSL security indicators (the lock icon and such) proceeds
     // in two phases:
     //
-    // 1) An SSLManager changes the SSLHostState (which hangs off the profile
-    //    object).  When this happens, the SSLManager broadcasts an
-    //    SSL_INTERNAL_STATE_CHANGED notification.
+    // 1) The internal SSL state for a host or tab changes.  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 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.
+    //    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.
 
     // 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
@@ -149,9 +148,7 @@ class NotificationType {
     // case.  Listen to this notification if you need to refresh SSL-related UI
     // elements.
     //
-    // 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.
+    // There is no source or details.
     SSL_VISIBLE_STATE_CHANGED,
 
     // The SSL state of the browser has changed in some internal way.  For