Disable the ChromeFrame Firefox tests on Windows 7 due to a bug in Firefox ca...

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 208 matching lines @@
     BrowserKind browser, const wchar_t* page, const char* result) {
   ASSERT_TRUE(LaunchBrowser(browser, page));
   server_mock_.ExpectAndHandlePostedResult(CFInvocation(CFInvocation::NONE),
                                            kPostedResultSubstring);
   WaitForTestToComplete(TestTimeouts::action_max_timeout_ms());
   ASSERT_EQ(result, server_mock_.posted_result());
 }
 
 void ChromeFrameTestWithWebServer::SimpleBrowserTest(BrowserKind browser,
     const wchar_t* page) {
+  if (browser == FIREFOX &&
+      base::win::GetVersion() == base::win::VERSION_WIN7) {
+    LOG(INFO) << "Not running Firefox tests on Windows 7";
+    return;
+  }
   SimpleBrowserTestExpectedResult(browser, page, "OK");
 }
 
 void ChromeFrameTestWithWebServer::OptionalBrowserTest(BrowserKind browser,
     const wchar_t* page) {
   DCHECK(browser != CHROME) << "Chrome tests shouldn't be optional";
   if (!LaunchBrowser(browser, page)) {
     LOG(ERROR) << "Failed to launch browser " << ToString(browser);
   } else {
     server_mock_.ExpectAndHandlePostedResult(CFInvocation(CFInvocation::NONE),
                                              kPostedResultSubstring);
     WaitForTestToComplete(TestTimeouts::action_max_timeout_ms());
     ASSERT_EQ("OK", server_mock_.posted_result());
   }
 }
 
 void ChromeFrameTestWithWebServer::VersionTest(BrowserKind browser,
     const wchar_t* page) {
+  if (browser == FIREFOX &&
+      base::win::GetVersion() == base::win::VERSION_WIN7) {
+    LOG(INFO) << "Not running Firefox tests on Windows 7";
+    return;
+  }
+
   FilePath plugin_path;
   PathService::Get(base::DIR_MODULE, &plugin_path);
   plugin_path = plugin_path.AppendASCII("servers");
   plugin_path = plugin_path.Append(kChromeFrameDllName);
 
   static FileVersionInfo* version_info =
       FileVersionInfo::CreateFileVersionInfo(plugin_path);
 
   std::wstring version;
   if (version_info)
@@ skipping 27 matching lines @@
   server_mock_.ExpectAndHandlePostedResult(CFInvocation(CFInvocation::NONE),
                                            kPostedResultSubstring);
   WaitForTestToComplete(TestTimeouts::action_max_timeout_ms());
   ASSERT_EQ(version, UTF8ToWide(server_mock_.posted_result()));
 }
 
 void ChromeFrameTestWithWebServer::SessionIdTest(BrowserKind browser,
                                                  const wchar_t* page,
                                                  int privilege_mode,
                                                  const char* expected_result) {
+  if (browser == FIREFOX &&
+      base::win::GetVersion() == base::win::VERSION_WIN7) {
+    LOG(INFO) << "Not running Firefox tests on Windows 7";
+    return;
+  }
+
   SetConfigInt(kEnableFirefoxPrivilegeMode, privilege_mode);
   EXPECT_TRUE(LaunchBrowser(browser, page));
   server_mock_.set_expected_result(expected_result);
   server_mock_.ExpectAndHandlePostedResult(CFInvocation(CFInvocation::NONE),
                                            kPostedResultSubstring);
   WaitForTestToComplete(TestTimeouts::action_max_timeout_ms());
   ASSERT_EQ(expected_result, server_mock_.posted_result());
 }
 
 // MockWebServer methods
@@ skipping 741 matching lines @@
 }
 
 const wchar_t kWindowCloseTestUrl[] =
     L"window_close.html";
 
 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_WindowClose) {
   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 210 matching lines @@
   server.web_server()->AddResponse(response);
 
   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());
 }