From 132048857e69b3f07e7d50bda996d1923c9c8e7b Mon Sep 17 00:00:00 2001
From: "rvargas@google.com"
 <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 15 May 2010 02:59:07 +0000
Subject: 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
---
 chrome/test/automation/automation_messages.h          | 15 +++++----------
 chrome/test/data/ssl/page_displays_mixed_content.html | 15 ---------------
 chrome/test/data/ssl/page_runs_mixed_content.html     |  8 --------
 chrome/test/data/ssl/page_with_http_script.html       |  8 ++++++++
 chrome/test/data/ssl/page_with_mixed_contents.html    | 15 +++++++++++++++
 5 files changed, 28 insertions(+), 33 deletions(-)
 delete mode 100644 chrome/test/data/ssl/page_displays_mixed_content.html
 delete mode 100644 chrome/test/data/ssl/page_runs_mixed_content.html
 create mode 100644 chrome/test/data/ssl/page_with_http_script.html
 create mode 100644 chrome/test/data/ssl/page_with_mixed_contents.html

(limited to 'chrome/test')

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_displays_mixed_content.html b/chrome/test/data/ssl/page_displays_mixed_content.html
deleted file mode 100644
index 479fb3b..0000000
--- a/chrome/test/data/ssl/page_displays_mixed_content.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head><title>Page that displays mixed content</title>
-<script>
-  function ImageWidth() {
-    return document.getElementById("bad_image").width;
-  }
-</script>
-</head>
-<body>
-This page contains an image which is served over an http connection,
-causing mixed contents (when this page is loaded over https).<br>
-<img id="bad_image" src="http://localhost:1337/files/ssl/google_files/logo.gif"/>
-
-</body>
-</html>
diff --git a/chrome/test/data/ssl/page_runs_mixed_content.html b/chrome/test/data/ssl/page_runs_mixed_content.html
deleted file mode 100644
index 9e8f18e..0000000
--- a/chrome/test/data/ssl/page_runs_mixed_content.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<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>
-<script src="http://localhost:1337/files/ssl/randomize_hash.js"></script>
-</body>
-</html>
diff --git a/chrome/test/data/ssl/page_with_http_script.html b/chrome/test/data/ssl/page_with_http_script.html
new file mode 100644
index 0000000..d0719c4
--- /dev/null
+++ b/chrome/test/data/ssl/page_with_http_script.html
@@ -0,0 +1,8 @@
+<html>
+<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>
+<script src="http://localhost:1337/files/ssl/randomize_hash.js"></script>
+</body>
+</html>
diff --git a/chrome/test/data/ssl/page_with_mixed_contents.html b/chrome/test/data/ssl/page_with_mixed_contents.html
new file mode 100644
index 0000000..b19730a
--- /dev/null
+++ b/chrome/test/data/ssl/page_with_mixed_contents.html
@@ -0,0 +1,15 @@
+<html>
+<head><title>Page with mixed contents</title>
+<script>
+  function ImageWidth() {
+    return document.getElementById("bad_image").width;
+  }
+</script>
+</head>
+<body>
+This page contains an image which is served over an http connection,
+causing mixed contents (when this page is loaded over https).<br>
+<img id="bad_image" src="http://localhost:1337/files/ssl/google_files/logo.gif"/>
+
+</body>
+</html>
-- 
cgit v1.1