diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-15 02:59:07 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-15 02:59:07 +0000 |
| commit | 132048857e69b3f07e7d50bda996d1923c9c8e7b (patch) | |
| tree | d98c67ef93da6b9cd31acf1532e6f2dbba18a97c /chrome/test | |
| parent | f3b6d491f7f4233b4862f7352f6ed477f3f1e95a (diff) | |
| download | chromium_src-132048857e69b3f07e7d50bda996d1923c9c8e7b.zip chromium_src-132048857e69b3f07e7d50bda996d1923c9c8e7b.tar.gz chromium_src-132048857e69b3f07e7d50bda996d1923c9c8e7b.tar.bz2 | |
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
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/automation/automation_messages.h | 15 | ||||
| -rw-r--r-- | chrome/test/data/ssl/page_with_http_script.html (renamed from chrome/test/data/ssl/page_runs_mixed_content.html) | 2 | ||||
| -rw-r--r-- | chrome/test/data/ssl/page_with_mixed_contents.html (renamed from chrome/test/data/ssl/page_displays_mixed_content.html) | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/chrome/test/automation/automation_messages.h b/chrome/test/automation/automation_messages.h index d2fff4b..ddd1c83 100644 --- a/chrome/test/automation/automation_messages.h +++ b/chrome/test/automation/automation_messages.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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,8 +452,7 @@ struct NavigationInfo { std::wstring title; GURL url; SecurityStyle security_style; - bool displayed_mixed_content; - bool ran_mixed_content; + bool has_mixed_content; }; // Traits for NavigationInfo structure to pack/unpack. @@ -467,8 +466,7 @@ struct ParamTraits<NavigationInfo> { WriteParam(m, p.title); WriteParam(m, p.url); WriteParam(m, p.security_style); - WriteParam(m, p.displayed_mixed_content); - WriteParam(m, p.ran_mixed_content); + WriteParam(m, p.has_mixed_content); } static bool Read(const Message* m, void** iter, param_type* p) { return ReadParam(m, iter, &p->navigation_type) && @@ -477,8 +475,7 @@ struct ParamTraits<NavigationInfo> { ReadParam(m, iter, &p->title) && ReadParam(m, iter, &p->url) && ReadParam(m, iter, &p->security_style) && - ReadParam(m, iter, &p->displayed_mixed_content) && - ReadParam(m, iter, &p->ran_mixed_content); + ReadParam(m, iter, &p->has_mixed_content); } static void Log(const param_type& p, std::wstring* l) { l->append(L"("); @@ -494,9 +491,7 @@ struct ParamTraits<NavigationInfo> { l->append(L", "); LogParam(p.security_style, l); l->append(L", "); - LogParam(p.displayed_mixed_content, l); - l->append(L", "); - LogParam(p.ran_mixed_content, l); + LogParam(p.has_mixed_content, l); l->append(L")"); } }; diff --git a/chrome/test/data/ssl/page_runs_mixed_content.html b/chrome/test/data/ssl/page_with_http_script.html index 9e8f18e..d0719c4 100644 --- a/chrome/test/data/ssl/page_runs_mixed_content.html +++ b/chrome/test/data/ssl/page_with_http_script.html @@ -1,5 +1,5 @@ <html> -<head><title>Page that runs mixed content</title></head> +<head><title>Page with http script</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> diff --git a/chrome/test/data/ssl/page_displays_mixed_content.html b/chrome/test/data/ssl/page_with_mixed_contents.html index 479fb3b..b19730a 100644 --- a/chrome/test/data/ssl/page_displays_mixed_content.html +++ b/chrome/test/data/ssl/page_with_mixed_contents.html @@ -1,5 +1,5 @@ <html> -<head><title>Page that displays mixed content</title> +<head><title>Page with mixed contents</title> <script> function ImageWidth() { return document.getElementById("bad_image").width; |