Revert 47357 - Revert 47347 (Original patch reviewed at http://codereview.ch...

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

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=47428

[rvargas (doing something else), 2010-05-17 17:52:06]

OK

http://codereview.chromium.org/2126005/diff/1/5
File chrome/browser/ssl/ssl_browser_tests.cc (right):

http://codereview.chromium.org/2126005/diff/1/5#newcode812
chrome/browser/ssl/ssl_browser_tests.cc:812: IN_PROC_BROWSER_TEST_F(SSLUITest,
FLAKY_TestGoodFrameNavigation) {
Wasn't this the test that you were leaving disabled this time?

[Peter Kasting, 2010-05-17 17:55:33]

http://codereview.chromium.org/2126005/diff/1/5
File chrome/browser/ssl/ssl_browser_tests.cc (right):

http://codereview.chromium.org/2126005/diff/1/5#newcode812
chrome/browser/ssl/ssl_browser_tests.cc:812: IN_PROC_BROWSER_TEST_F(SSLUITest,
FLAKY_TestGoodFrameNavigation) {
On 2010/05/17 17:52:06, rvargas wrote:
> Wasn't this the test that you were leaving disabled this time?

Yes.  The actual commit leaves it DISABLED.  This upload was from drover before
I had a chance to change it, and I dind't upload a second version.