diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-15 00:38:36 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-15 00:38:36 +0000 |
| commit | 18de157f6c4c5eee14ad84e037def47a7f52a3a8 (patch) | |
| tree | ade764c9a40927c1856a759d0f92e6456bf7f2ea /chrome/test/data/ssl | |
| parent | 429e1ec2b634ce856c43f077ae6d18d537fc86f2 (diff) | |
| download | chromium_src-18de157f6c4c5eee14ad84e037def47a7f52a3a8.zip chromium_src-18de157f6c4c5eee14ad84e037def47a7f52a3a8.tar.gz chromium_src-18de157f6c4c5eee14ad84e037def47a7f52a3a8.tar.bz2 | |
(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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47347 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/data/ssl')
| -rw-r--r-- | chrome/test/data/ssl/page_displays_mixed_content.html (renamed from chrome/test/data/ssl/page_with_mixed_contents.html) | 2 | ||||
| -rw-r--r-- | chrome/test/data/ssl/page_runs_mixed_content.html (renamed from chrome/test/data/ssl/page_with_http_script.html) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/data/ssl/page_with_mixed_contents.html b/chrome/test/data/ssl/page_displays_mixed_content.html index b19730a..479fb3b 100644 --- a/chrome/test/data/ssl/page_with_mixed_contents.html +++ b/chrome/test/data/ssl/page_displays_mixed_content.html @@ -1,5 +1,5 @@ <html> -<head><title>Page with mixed contents</title> +<head><title>Page that displays mixed content</title> <script> function ImageWidth() { return document.getElementById("bad_image").width; diff --git a/chrome/test/data/ssl/page_with_http_script.html b/chrome/test/data/ssl/page_runs_mixed_content.html index d0719c4..9e8f18e 100644 --- a/chrome/test/data/ssl/page_with_http_script.html +++ b/chrome/test/data/ssl/page_runs_mixed_content.html @@ -1,5 +1,5 @@ <html> -<head><title>Page with http script</title></head> +<head><title>Page that runs mixed content</title></head> <body> This page contains an script which is served over an http connection, causing mixed contents (when this page is loaded over https).<br> |