Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1032)

Unified Diff: chrome_frame/test/navigation_test.cc

Issue 4998003: Not running the following Chromeframe tests on IE9. This will enable the buil... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome_frame/test/test_with_web_server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/navigation_test.cc
===================================================================
--- chrome_frame/test/navigation_test.cc (revision 65626)
+++ chrome_frame/test/navigation_test.cc (working copy)
@@ -748,11 +748,16 @@
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 GetInstalledIEVers
+ LOG(INFO) << "Not running test on Vista/Windows 7 with IE9";
+ return;
+ }
}
+
chrome_frame_test::MockWindowObserver download_watcher;
download_watcher.WatchWindow("File Download", "");
« no previous file with comments | « no previous file | chrome_frame/test/test_with_web_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698