summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-23 22:36:27 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-23 22:36:27 +0000
commit900eb2f13b70447fe617b57a28a75b152b4d3eb0 (patch)
tree112d7a531ce68b1b3284242d3c8c179329deaac2 /chrome_frame/test
parent7256dabd02eaafcfdae1e20253cc8eeb25e677cc (diff)
downloadchromium_src-900eb2f13b70447fe617b57a28a75b152b4d3eb0.zip
chromium_src-900eb2f13b70447fe617b57a28a75b152b4d3eb0.tar.gz
chromium_src-900eb2f13b70447fe617b57a28a75b152b4d3eb0.tar.bz2
Clean up the way top level navigations are handled in ChromeFrame and reported back
to the host browser. We no longer have a counter which tracks the last page id. Top level navigations are reported back if the current frame does not have an opener or if the origins don't match. The other conditions remain the same i.e reloads/back forwards and posts don't make it to the host browser and are treated as internal navigations. This fixes bug http://code.google.com/p/chromium/issues/detail?id=52931 Disabled the navigate out chrome frame test as this needs to be fixed to propertly detect navigations coming out of chrome frame. Bug=52931 Review URL: http://codereview.chromium.org/3174027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
-rw-r--r--chrome_frame/test/test_with_web_server.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index 6067ca2..db0397d 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -771,8 +771,10 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_PersistentCookieTest) {
SimpleBrowserTest(IE, kPersistentCookieTest, L"PersistentCookieTest");
}
+// This test has been disabled because we need a better way to navigate out
+// of chrome frame and detect it.
const wchar_t kNavigateOutPage[] = L"files/navigate_out.html";
-TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_NavigateOut) {
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_NavigateOut) {
SimpleBrowserTest(IE, kNavigateOutPage, L"navigate_out");
}