summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/data
diff options
context:
space:
mode:
authoramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-03 22:29:26 +0000
committeramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-03 22:29:26 +0000
commit737d8a62d54a2475fa0fc23a681a8d5293096754 (patch)
tree06054c5370ec3531fb84225f883e49a0b508ba69 /chrome_frame/test/data
parent3460228438564690022243511825894c9c600608 (diff)
downloadchromium_src-737d8a62d54a2475fa0fc23a681a8d5293096754.zip
chromium_src-737d8a62d54a2475fa0fc23a681a8d5293096754.tar.gz
chromium_src-737d8a62d54a2475fa0fc23a681a8d5293096754.tar.bz2
Fix the three tests broken by gcf: change.
BUG=34461 TEST=Fixed and enabled tests CFProtocol, Persistent cookie and NavigateOut Review URL: http://codereview.chromium.org/561057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/data')
-rw-r--r--chrome_frame/test/data/navigate_out.html11
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome_frame/test/data/navigate_out.html b/chrome_frame/test/data/navigate_out.html
index 5f447c9..4166aaf 100644
--- a/chrome_frame/test/data/navigate_out.html
+++ b/chrome_frame/test/data/navigate_out.html
@@ -1,12 +1,13 @@
<html>
<head><title>Test to make sure that navigations sent back to IE</title>
+ <meta http-equiv="X-UA-Compatible" content="chrome=1" />
<script type="text/javascript"
src="chrome_frame_tester_helpers.js"></script>
-
<script type="text/javascript">
function test() {
+ var test_name = 'navigate_out';
if (isRunningInMSIE()) {
- reloadUsingCFProtocol();
+ onFailure(test_name, 1, 'Meta tag failed to load page in Chrome');
} else {
window.location = "back_to_ie.html";
}
@@ -14,7 +15,9 @@
</script>
</head>
<body onLoad="setTimeout(test, 100);">
- <h2>Prepare to be redirected!</h2>
- <p>Redirects the same page to its 'gcf:' version and </p>
+ <h2>Test navigations in and out of IE</h2>
+ <p>This page should be loaded in chrome and then we redirect to another
+ page that should get loaded in IE.
+ </p>
</body>
</html>