Not running the following Chromeframe tests on IE9. This will enable the buil...

chrome_frame/test/navigation_test.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 <string>
 
 #include "base/scoped_comptr_win.h"
 #include "base/test/test_file_util.h"
 #include "base/win/windows_version.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
@@ skipping 730 matching lines @@
 // Navigates IE to a URL which in ChromeFrame.
 // Performs a top level form post in the document
 // In response to the POST we send over an attachment via the
 // content-disposition header.
 // IE brings up a file open dialog in this context.
 // We bring up the Save dialog via accessibility and save the file
 // and validate that all is well.
 TEST_F(FullTabDownloadTest, CF_DownloadFileFromPost) {
   // 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 &&
-      GetInstalledIEVersion() == IE_7) {
-    LOG(INFO) << "Not running test on Vista with IE7";
-    return;
+  if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
+    if (GetInstalledIEVersion() == IE_7) {
+      LOG(INFO) << "Not running test on Vista with IE7";
+      return;
+    } else if (GetInstalledIEVersion() == IE_9) {

[amit, 2010/11/15 21:25:47]

nit: wouldn't be better to call GetInstalledIEVersion() just once?

+      LOG(INFO) << "Not running test on Vista/Windows 7 with IE9";
+      return;
+    }
   }
+
   chrome_frame_test::MockWindowObserver download_watcher;
   download_watcher.WatchWindow("File Download", "");
 
   chrome_frame_test::MockWindowObserver save_dialog_watcher;
   save_dialog_watcher.WatchWindow("Save As", "");
 
   EXPECT_CALL(server_mock_, Get(_, StrEq(L"/post_source.html"), _)).WillOnce(
     SendFast(
       "HTTP/1.1 200 OK\r\n"
       "Content-Type: text/html\r\n",
@@ skipping 180 matching lines @@
           DelayRefresh(&ie_mock_, &loop_, 2000),
           DelayCloseBrowserMock(&loop_, 4000, &ie_mock_)));
 
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(src_url)))
       .Times(2);
 
   LaunchIEAndNavigate(src_url);
 }
 
 }  // namespace chrome_frame_test