Enable ChromeFrame net tests for IE versions 8 and below. Changes include the following:-

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

2. The TestSuite and NetTestSuite classes now provide special protected constructors which allow
   test instances to control whether an AtExitManager instance is created for the duration of the
   test. The ChromeFrame net test suite reuses the AtExitManager instance created in BrowserMain.

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/8907054

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

1 files changed, 8 insertions, 20 deletions

diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 34a728a..389fbf9 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -263,6 +263,11 @@ void FilterDisabledTests() {
     // Flaky on the tryservers, http://crbug.com/103097
     "URLRequestTestHTTP.MultipleRedirectTest",
     "URLRequestTestHTTP.NetworkDelegateRedirectRequest",
+
+    // These tests are unsupported in CF.
+    "HTTPSRequestTest.HTTPSPreloadedHSTSTest",
+    "HTTPSRequestTest.ResumeTest",
+    "HTTPSRequestTest.SSLSessionCacheShardTest",
   };
 
   const char* ie9_disabled_tests[] = {
@@ -457,7 +462,7 @@ FakeBrowserProcessImpl* FakeExternalTab::browser_process() const {
 }
 
 CFUrlRequestUnittestRunner::CFUrlRequestUnittestRunner(int argc, char** argv)
-    : NetTestSuite(argc, argv),
+    : NetTestSuite(argc, argv, false),
       chrome_frame_html_("/chrome_frame", kChromeFrameHtml),
       registrar_(chrome_frame_test::GetTestBedType()),
       test_result_(0) {
@@ -659,21 +664,6 @@ 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:
@@ -729,15 +719,13 @@ int main(int argc, char** argv) {
   g_argc = argc;
   g_argv = argv;
 
-  // Temporarily disabled, http://crbug.com/105435.
-  if (true || chrome_frame_test::GetInstalledIEVersion() >= IE_9) {
+  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) << "Temporarily not running ChromeFrame net tests.";
-    //LOG(INFO) << "Not running ChromeFrame net tests on IE9+";
+    LOG(INFO) << "Not running ChromeFrame net tests on IE9+";
     return 0;
   }