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

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 620 matching lines @@
   OptionalBrowserTest(SAFARI, kCFIIfrPostPage);
 }
 
 TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_CFInstanceIfrPost) {
   OptionalBrowserTest(OPERA, kCFIIfrPostPage);
 }
 
 const wchar_t kCFIPostPage[] = L"CFInstance_post_host.html";
 
 TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstancePost) {
+  if (chrome_frame_test::GetInstalledIEVersion() == IE_9) {
+    LOG(INFO) << "Not running test on Vista/Windows 7 with IE9";
+    return;
+  }
   SimpleBrowserTest(IE, kCFIPostPage);
 }
 
 // This test randomly fails on the ChromeFrame builder.
 // Bug http://code.google.com/p/chromium/issues/detail?id=31532
 TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeFF_CFInstancePost) {
   SimpleBrowserTest(FIREFOX, kCFIPostPage);
 }
 
 TEST_F(ChromeFrameTestWithWebServer, WidgetModeChrome_CFInstancePost) {
   SimpleBrowserTest(CHROME, kCFIPostPage);
 }
 
 TEST_F(ChromeFrameTestWithWebServer, WidgetModeSafari_CFInstancePost) {
   OptionalBrowserTest(SAFARI, kCFIPostPage);
 }
 
 TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeOpera_CFInstancePost) {
   OptionalBrowserTest(OPERA, kCFIPostPage);
 }
 
 const wchar_t kCFIRPCPage[] = L"CFInstance_rpc_host.html";
 
 TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceRPC) {
+  if (chrome_frame_test::GetInstalledIEVersion() == IE_9) {
+    LOG(INFO) << "Not running test on Vista/Windows 7 with IE9";
+    return;
+  }
   SimpleBrowserTest(IE, kCFIRPCPage);
 }
 
 // This test randomly fails on the ChromeFrame builder.
 // Bug http://code.google.com/p/chromium/issues/detail?id=31532
 TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeFF_CFInstanceRPC) {
   SimpleBrowserTest(FIREFOX, kCFIRPCPage);
 }
 
 TEST_F(ChromeFrameTestWithWebServer, WidgetModeChrome_CFInstanceRPC) {
   SimpleBrowserTest(CHROME, kCFIRPCPage);
 }
 
 TEST_F(ChromeFrameTestWithWebServer, WidgetModeSafari_CFInstanceRPC) {
   OptionalBrowserTest(SAFARI, kCFIRPCPage);
 }
 
 TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeOpera_CFInstanceRPC) {
   OptionalBrowserTest(OPERA, kCFIRPCPage);
 }
 
 const wchar_t kCFIRPCInternalPage[] =
     L"CFInstance_rpc_internal_host.html";
 
 TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceRPCInternal) {
+  if (chrome_frame_test::GetInstalledIEVersion() == IE_9) {
+    LOG(INFO) << "Not running test on Vista/Windows 7 with IE9";
+    return;
+  }
   SimpleBrowserTest(IE, kCFIRPCInternalPage);
 }
 
 // http://code.google.com/p/chromium/issues/detail?id=37204
 TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeFF_CFInstanceRPCInternal) {
   SimpleBrowserTest(FIREFOX, kCFIRPCInternalPage);
 }
 
 TEST_F(ChromeFrameTestWithWebServer, WidgetModeChrome_CFInstanceRPCInternal) {
   SimpleBrowserTest(CHROME, kCFIRPCInternalPage);
@@ skipping 403 matching lines @@
 
   loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
 
   test_server::SimpleWebServer* ws = server.web_server();
   const test_server::ConnectionList& connections = ws->connections();
   test_server::ConnectionList::const_iterator it = connections.begin();
   int requests_for_first_page = 0;
   for (; it != connections.end(); ++it) {
     test_server::Connection* c = (*it);
     const test_server::Request& r = c->request();
-    if (ASCIIToWide(r.path().substr(1)).compare(kPages[0]) == 0) {
+    if (!r.path().empty() &&
+        ASCIIToWide(r.path().substr(1)).compare(kPages[0]) == 0) {
       requests_for_first_page++;
       std::string ua(GetHeaderValue(r.headers(), "User-Agent"));
       EXPECT_NE(std::string::npos, ua.find("chromeframe"));
     }
   }
   EXPECT_GT(requests_for_first_page, 1);
 }
 
 // See bug 36694 for details.  http://crbug.com/36694
 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestDownloadFromForm) {
@@ skipping 113 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());
 }