Index: chrome_frame/test/net/fake_external_tab.cc |
=================================================================== |
--- chrome_frame/test/net/fake_external_tab.cc (revision 65626) |
+++ chrome_frame/test/net/fake_external_tab.cc (working copy) |
@@ -304,7 +304,7 @@ |
// done by TestSuite::Initialize. We can't call the base class |
// directly because it will attempt to initialize some things such as |
// ICU that have already been initialized for this process. |
- InitializeLogging(); |
+ CFUrlRequestUnittestRunner::InitializeLogging(); |
base::Time::EnableHighResolutionTimer(true); |
SuppressErrorDialogs(); |
@@ -472,6 +472,15 @@ |
ObligatoryModule g_obligatory_atl_module; |
int main(int argc, char** argv) { |
+ if (chrome_frame_test::GetInstalledIEVersion() == IE_9) { |
+ // Adding this here as the command line and the logging stuff gets |
+ // initialized in the NetTestSuite constructor. Did not want to break that. |
+ base::AtExitManager at_exit_manager_; |
+ CommandLine::Init(argc, argv); |
+ CFUrlRequestUnittestRunner::InitializeLogging(); |
+ LOG(INFO) << "Not running ChromeFrame net tests on IE9"; |
+ return 0; |
+ } |
WindowWatchdog watchdog; |
// See url_request_unittest.cc for these credentials. |
SupplyProxyCredentials credentials("user", "secret"); |