commit 132048857e69b3f07e7d50bda996d1923c9c8e7b
author rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Sat May 15 02:59:07 2010
committer rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Sat May 15 02:59:07 2010
tree d98c67ef93da6b9cd31acf1532e6f2dbba18a97c
parent f3b6d491f7f4233b4862f7352f6ed477f3f1e95a

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