Disabling a number of failing chrome frame tests on Vista with IE7. Most of t...

chrome_frame/test/test_with_web_server.cc

 // Copyright (c) 2010 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.
 
 #include "chrome_frame/test/test_with_web_server.h"
 
 #include "base/base_paths.h"
 #include "base/file_version_info.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
@@ skipping 1004 matching lines @@
     L"xmlhttprequest_conditional_header_test.html";
 
 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_XHRConditionalHeaderTest) {
   SimpleBrowserTest(IE, kXHRConditionalHeaderTestUrl);
 }
 
 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;
+  }
+
   SimpleBrowserTest(IE, kWindowCloseTestUrl);
 }
 
 TEST_F(ChromeFrameTestWithWebServer, FullTabModeFF_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;
+  }
   SimpleBrowserTest(FIREFOX, kWindowCloseTestUrl);
 }
 
 std::string GetHeaderValue(const std::string& headers,
                            const char* header_name) {
   net::HttpUtil::HeadersIterator it(headers.begin(), headers.end(),
                                     "\r\n");
   while (it.GetNext()) {
     if (lstrcmpiA(it.name().c_str(), header_name) == 0) {
       return it.values();
@@ skipping 207 matching lines @@
 
   std::wstring url(server.FormatHttpPath(L"form.html"));
 
   ASSERT_TRUE(LaunchBrowser(IE, url.c_str()));
   loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
 
   EXPECT_EQ(1, response->get_request_count());
   EXPECT_EQ(1, response->post_request_count());
 }