f17a0ee61359bdf6633e164501f3370fa2f98164 - chromium/src

commit	f17a0ee61359bdf6633e164501f3370fa2f98164	[log] [tgz]
author	pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	Mon May 17 17:38:47 2010
committer	pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	Mon May 17 17:38:47 2010
tree	64ec900e4089bd99475fe4d10432bca5f138d080
parent	1274a4f5664d879b1e2d12f4113daf0b1dedfa40 [diff]

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

chrome/app/generated_resources.grd[diff]
chrome/browser/external_tab_container.cc[diff]
chrome/browser/page_info_model.cc[diff]
chrome/browser/ssl/ssl_browser_tests.cc[diff]
chrome/browser/ssl/ssl_host_state.cc[diff]
chrome/browser/ssl/ssl_host_state.h[diff]
chrome/browser/ssl/ssl_host_state_unittest.cc[diff]
chrome/browser/ssl/ssl_manager.cc[diff]
chrome/browser/ssl/ssl_manager.h[diff]
chrome/browser/ssl/ssl_policy.cc[diff]
chrome/browser/ssl/ssl_policy.h[diff]
chrome/browser/ssl/ssl_policy_backend.cc[diff]
chrome/browser/ssl/ssl_policy_backend.h[diff]
chrome/browser/tab_contents/navigation_entry.h[diff]
chrome/browser/tab_contents/navigation_entry_unittest.cc[diff]
chrome/browser/tab_contents/tab_contents.cc[diff]
chrome/browser/tab_contents/tab_contents.h[diff]
chrome/browser/toolbar_model.cc[diff]
chrome/common/notification_type.h[diff]
chrome/test/automation/automation_messages.h[diff]
chrome/test/data/ssl/page_displays_mixed_content.html[Renamed from chrome/test/data/ssl/page_with_mixed_contents.html - diff]
chrome/test/data/ssl/page_runs_mixed_content.html[Renamed from chrome/test/data/ssl/page_with_http_script.html - diff]
chrome_frame/chrome_active_document.cc[diff]

23 files changed

tree: 64ec900e4089bd99475fe4d10432bca5f138d080