summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/test_with_web_server.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame/test/test_with_web_server.cc')
-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);
}