Revert 114320 (broke chrome_frame_tests) - Enable ChromeFrame net tests for IE versions 8 and bel...

chrome_frame/test/net/fake_external_tab.cc

 // Copyright (c) 2011 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/net/fake_external_tab.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <exdisp.h>
 
@@ skipping 245 matching lines @@
     "URLRequestTestHTTP.NetworkDelegateOnAuthRequiredSyncNoAction",
     "URLRequestTestHTTP.NetworkDelegateOnAuthRequiredSyncSetAuth",
     "URLRequestTestHTTP.NetworkDelegateOnAuthRequiredSyncCancel",
     "URLRequestTestHTTP.NetworkDelegateOnAuthRequiredAsyncNoAction",
     "URLRequestTestHTTP.NetworkDelegateOnAuthRequiredAsyncSetAuth",
     "URLRequestTestHTTP.NetworkDelegateOnAuthRequiredAsyncCancel",
 
     // Flaky on the tryservers, http://crbug.com/103097
     "URLRequestTestHTTP.MultipleRedirectTest",
     "URLRequestTestHTTP.NetworkDelegateRedirectRequest",
-
-    // Newly added tests which fail in CF.
-    "HTTPSRequestTest.HTTPSPreloadedHSTSTest",
-    "HTTPSRequestTest.ResumeTest",
-    "HTTPSRequestTest.SSLSessionCacheShardTest",
   };
 
   const char* ie9_disabled_tests[] = {
     // These always hang on Joi's box with IE9, http://crbug.com/105435.
     // Several other tests, e.g. URLRequestTestHTTP.CancelTest2, 3 and
     // 5, often hang but not always.
     "URLRequestTestHTTP.NetworkDelegateRedirectRequestPost",
     "URLRequestTestHTTP.GetTest",
     "HTTPSRequestTest.HTTPSPreloadedHSTSTest",
   };
@@ skipping 376 matching lines @@
   fake_chrome_.reset();
 
 #ifndef NDEBUG
   // Avoid CRT cleanup in debug test runs to ensure that webkit ASSERTs which
   // check if globals are created and destroyed on the same thread don't fire.
   // Webkit global objects are created on the inproc renderer thread.
   ExitProcess(test_result());
 #endif
 }
 
+// We need a module since some of the accessibility code that gets pulled
+// in here uses ATL.
+class ObligatoryModule: public CAtlExeModuleT<ObligatoryModule> {
+ public:
+  static HRESULT InitializeCom() {
+    return OleInitialize(NULL);
+  }
+
+  static void UninitializeCom() {
+    OleUninitialize();
+  }
+};
+
+ObligatoryModule g_obligatory_atl_module;
+
 const char* IEVersionToString(IEVersion version) {
   switch (version) {
     case IE_6:
       return "IE6";
     case IE_7:
       return "IE7";
     case IE_8:
       return "IE8";
     case IE_9:
       return "IE9";
@@ skipping 35 matching lines @@
 }
 
 int WorkerMain(const content::MainFunctionParams& parameters) {
   return PluginMain(parameters);
 }
 
 int main(int argc, char** argv) {
   g_argc = argc;
   g_argv = argv;
 
-  if (chrome_frame_test::GetInstalledIEVersion() >= IE_9) {
+  // Temporarily disabled, http://crbug.com/105435.
+  if (true || 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+";
+    LOG(INFO) << "Temporarily not running ChromeFrame net tests.";
+    //LOG(INFO) << "Not running ChromeFrame net tests on IE9+";
     return 0;
   }
 
   google_breakpad::scoped_ptr<google_breakpad::ExceptionHandler> breakpad(
       InitializeCrashReporting(HEADLESS));
 
   // Display the IE version we run with. This must be done after
   // CFUrlRequestUnittestRunner is constructed since that initializes logging.
   IEVersion ie_version = chrome_frame_test::GetInstalledIEVersion();
   LOG(INFO) << "Running CF net tests with IE version: "
             << IEVersionToString(ie_version);
 
   // See url_request_unittest.cc for these credentials.
   SupplyProxyCredentials credentials("user", "secret");
   WindowWatchdog watchdog;
   watchdog.AddObserver(&credentials, "Windows Security", "");
 
   sandbox::SandboxInterfaceInfo sandbox_info = {0};
   // This would normally be done, but is probably not needed for these tests.
   // content::InitializeSandboxInfo(&sandbox_info);
   FakeMainDelegate delegate;
   content::ContentMain(
       reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)),
       &sandbox_info,
       &delegate);
 
   // Note:  In debug builds, we ExitProcess during PostDestroyThreads.
   return g_test_suite->test_result();
 }