Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10397)

Unified Diff: chrome_frame/test/net/fake_external_tab.cc

Issue 8907054: Enable ChromeFrame net tests for IE versions 8 and below. Changes include the following:- (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/test/test_suite.cc ('k') | net/base/net_test_suite.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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",
+
+ // Newly added tests which fail in CF.
rvargas (doing something else) 2011/12/14 23:32:11 nit: this comment is bound to be stale pretty soon
ananta 2011/12/14 23:54:43 Updated the comment to reflect that these tests ar
+ "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;
}
« no previous file with comments | « base/test/test_suite.cc ('k') | net/base/net_test_suite.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698