| Index: chrome_frame/test/net/fake_external_tab.cc
|
| ===================================================================
|
| --- chrome_frame/test/net/fake_external_tab.cc (revision 114515)
|
| +++ chrome_frame/test/net/fake_external_tab.cc (working copy)
|
| @@ -263,6 +263,11 @@
|
| // 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 @@
|
| }
|
|
|
| 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 @@
|
| #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 @@
|
| 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;
|
| }
|
|
|
|
|