Enable ChromeFrame net tests. These tests regressed with the change in the ch...

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 487 matching lines @@
   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;
   }
 
-  return 0;
-
   // TODO(tommi): Stuff be broke. Needs a fixin'.
-#if 0
   // This is awkward: the TestSuite derived CFUrlRequestUnittestRunner contains
   // the instance of the AtExitManager that RegisterPathProvider() and others
   // below require. So we have to instantiate this first.
   CFUrlRequestUnittestRunner test_suite(argc, argv);
 
   // Register paths needed by the ScopedChromeFrameRegistrar.
   chrome::RegisterPathProvider();
   ScopedChromeFrameRegistrar registrar(chrome_frame_test::GetTestBedType());
 
   WindowWatchdog watchdog;
   // See url_request_unittest.cc for these credentials.
   SupplyProxyCredentials credentials("user", "secret");
   watchdog.AddObserver(&credentials, "Windows Security", "");
   testing::InitGoogleTest(&argc, argv);
   FilterDisabledTests();
   PluginService::EnableChromePlugins(false);
   test_suite.RunMainUIThread();
   return 0;
-#endif
 }