Revert 114320 (broke chrome_frame_tests) - Enable ChromeFrame net tests for IE versions 8 and below. Changes include the following:-

1. Get rid of the dummy AtlModule registration in the net test suite. This is no longer needed
   as there is a module instance instantiated by the content code.

2. The test suite class now instantiates the ShadowAtExitManager class which allows nesting of AtExitManager
   instances. This is needed because the ChromeFrame net tests suite now calls into ContentMain which also
   instantiates an AtExitManager instance.

Fixes bug http://code.google.com/p/chromium/issues/detail?id=105435

BUG=105435
TEST=ChromeFrame net tests should now run on the builders.
Review URL: http://codereview.chromium.org/8898026

TBR=ananta@chromium.org
Review URL: http://codereview.chromium.org/8937020

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

2 files changed, 20 insertions, 8 deletions

diff --git a/base/test/test_suite.h b/base/test/test_suite.h
index 6dfca0e..2572756 100644
--- a/base/test/test_suite.h
+++ b/base/test/test_suite.h
@@ -75,7 +75,7 @@ class TestSuite {
 
   // Make sure that we setup an AtExitManager so Singleton objects will be
   // destroyed.
-  base::ShadowingAtExitManager at_exit_manager_;
+  base::AtExitManager at_exit_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSuite);
 };
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 0dd79f3..34a728a 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -263,11 +263,6 @@ void FilterDisabledTests() {
     // 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[] = {
@@ -664,6 +659,21 @@ void CFUrlRequestUnittestRunner::PostDestroyThreads() {
 #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:
@@ -719,13 +729,15 @@ 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;
   }