diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-17 17:38:47 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-17 17:38:47 +0000 |
| commit | f17a0ee61359bdf6633e164501f3370fa2f98164 (patch) | |
| tree | 64ec900e4089bd99475fe4d10432bca5f138d080 /chrome/test | |
| parent | 1274a4f5664d879b1e2d12f4113daf0b1dedfa40 (diff) | |
| download | chromium_src-f17a0ee61359bdf6633e164501f3370fa2f98164.zip chromium_src-f17a0ee61359bdf6633e164501f3370fa2f98164.tar.gz chromium_src-f17a0ee61359bdf6633e164501f3370fa2f98164.tar.bz2 | |
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
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/automation/automation_messages.h | 15 | ||||
| -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 |
3 files changed, 12 insertions, 7 deletions
diff --git a/chrome/test/automation/automation_messages.h b/chrome/test/automation/automation_messages.h index ddd1c83..d2fff4b 100644 --- a/chrome/test/automation/automation_messages.h +++ b/chrome/test/automation/automation_messages.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -452,7 +452,8 @@ struct NavigationInfo { std::wstring title; GURL url; SecurityStyle security_style; - bool has_mixed_content; + bool displayed_mixed_content; + bool ran_mixed_content; }; // Traits for NavigationInfo structure to pack/unpack. @@ -466,7 +467,8 @@ struct ParamTraits<NavigationInfo> { WriteParam(m, p.title); WriteParam(m, p.url); WriteParam(m, p.security_style); - WriteParam(m, p.has_mixed_content); + WriteParam(m, p.displayed_mixed_content); + WriteParam(m, p.ran_mixed_content); } static bool Read(const Message* m, void** iter, param_type* p) { return ReadParam(m, iter, &p->navigation_type) && @@ -475,7 +477,8 @@ struct ParamTraits<NavigationInfo> { ReadParam(m, iter, &p->title) && ReadParam(m, iter, &p->url) && ReadParam(m, iter, &p->security_style) && - ReadParam(m, iter, &p->has_mixed_content); + ReadParam(m, iter, &p->displayed_mixed_content) && + ReadParam(m, iter, &p->ran_mixed_content); } static void Log(const param_type& p, std::wstring* l) { l->append(L"("); @@ -491,7 +494,9 @@ struct ParamTraits<NavigationInfo> { l->append(L", "); LogParam(p.security_style, l); l->append(L", "); - LogParam(p.has_mixed_content, l); + LogParam(p.displayed_mixed_content, l); + l->append(L", "); + LogParam(p.ran_mixed_content, l); l->append(L")"); } }; 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> |