summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-27 23:21:44 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-27 23:21:44 +0000
commit606c75d600d3f564216de1d744c67a1ae1d6ce4a (patch)
treec11279d81d07b0efb6c669898020154d74b38456 /chrome_frame
parent276a3f8755894f18b6f4dd2a43cb9d7836f66444 (diff)
downloadchromium_src-606c75d600d3f564216de1d744c67a1ae1d6ce4a.zip
chromium_src-606c75d600d3f564216de1d744c67a1ae1d6ce4a.tar.gz
chromium_src-606c75d600d3f564216de1d744c67a1ae1d6ce4a.tar.bz2
Disabling the FullTabModeIE_WindowClose ChromeFrame test as it causes IE7/IE8 to put a
security warning infobar. Bug=61011 TBR=amit Review URL: http://codereview.chromium.org/4168005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64173 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/test_with_web_server.cc14
1 files changed, 5 insertions, 9 deletions
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index c3bce42..c3a0332 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -1021,15 +1021,11 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_XHRConditionalHeaderTest) {
const wchar_t kWindowCloseTestUrl[] =
L"window_close.html";
-TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_WindowClose) {
- // Please see http://code.google.com/p/chromium/issues/detail?id=60987
- // for more information on why this test is disabled for Vista with IE7.
- if (base::win::GetVersion() == base::win::VERSION_VISTA &&
- chrome_frame_test::GetInstalledIEVersion() == IE_7) {
- LOG(INFO) << "Not running test on Vista with IE7";
- return;
- }
-
+// This test causes IE to display an infobar on IE7 and IE8 on Vista and
+// Windows 7 at least which causes this test to fail. Disabling it for
+// now.
+// http://code.google.com/p/chromium/issues/detail?id=61011
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_WindowClose) {
SimpleBrowserTest(IE, kWindowCloseTestUrl);
}