Disable the chrome frame net tests on IE9 as the IE9 fails to connect at times to

the python web server. This needs more investigation.

TBR=amit

Review URL: http://codereview.chromium.org/4945001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66138 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 3 deletions

diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 8572f34..5c370ff 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -304,7 +304,7 @@ void CFUrlRequestUnittestRunner::Initialize() {
   // 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 @@ class ObligatoryModule: public CAtlExeModuleT<ObligatoryModule> {
 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");
diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h
index 5886568..ea7cb6b 100644
--- a/chrome_frame/test/net/fake_external_tab.h
+++ b/chrome_frame/test/net/fake_external_tab.h
@@ -73,6 +73,9 @@ class CFUrlRequestUnittestRunner
 
   void StartTests();
 
+  // Borrowed from TestSuite::Initialize().
+  static void InitializeLogging();
+
  protected:
   // This is the thread that runs all the UrlRequest tests.
   // Within its context, the Initialize() and Shutdown() routines above
@@ -82,8 +85,6 @@ class CFUrlRequestUnittestRunner
   static void TakeDownBrowser(CFUrlRequestUnittestRunner* me);
 
  protected:
-  // Borrowed from TestSuite::Initialize().
-  void InitializeLogging();
 
  protected:
   ScopedHandle test_thread_;