| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome_frame/test/net/fake_external_tab.h" | 5 #include "chrome_frame/test/net/fake_external_tab.h" |
| 6 | 6 |
| 7 #include <atlbase.h> | 7 #include <atlbase.h> |
| 8 #include <atlcom.h> | 8 #include <atlcom.h> |
| 9 #include <exdisp.h> | 9 #include <exdisp.h> |
| 10 #include <Winsock2.h> | 10 #include <Winsock2.h> |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 | 277 |
| 278 // Flaky on the tryservers, http://crbug.com/103097 | 278 // Flaky on the tryservers, http://crbug.com/103097 |
| 279 "URLRequestTestHTTP.MultipleRedirectTest", | 279 "URLRequestTestHTTP.MultipleRedirectTest", |
| 280 "URLRequestTestHTTP.NetworkDelegateRedirectRequest", | 280 "URLRequestTestHTTP.NetworkDelegateRedirectRequest", |
| 281 | 281 |
| 282 // These tests are unsupported in CF. | 282 // These tests are unsupported in CF. |
| 283 "HTTPSRequestTest.HTTPSPreloadedHSTSTest", | 283 "HTTPSRequestTest.HTTPSPreloadedHSTSTest", |
| 284 "HTTPSRequestTest.ResumeTest", | 284 "HTTPSRequestTest.ResumeTest", |
| 285 "HTTPSRequestTest.SSLSessionCacheShardTest", | 285 "HTTPSRequestTest.SSLSessionCacheShardTest", |
| 286 "HTTPSRequestTest.SSLSessionCacheShardTest", | 286 "HTTPSRequestTest.SSLSessionCacheShardTest", |
| 287 "HTTPSRequestTest.SSLv3Fallback", |
| 287 "HTTPSRequestTest.HTTPSErrorsNoClobberTSSTest", | 288 "HTTPSRequestTest.HTTPSErrorsNoClobberTSSTest", |
| 288 "HTTPSOCSPTest.*", | 289 "HTTPSOCSPTest.*", |
| 289 "HTTPSEVCRLSetTest.*", | 290 "HTTPSEVCRLSetTest.*", |
| 290 "HTTPSCRLSetTest.*" | 291 "HTTPSCRLSetTest.*" |
| 291 }; | 292 }; |
| 292 | 293 |
| 293 const char* ie9_disabled_tests[] = { | 294 const char* ie9_disabled_tests[] = { |
| 294 // These always hang on Joi's box with IE9, http://crbug.com/105435. | 295 // These always hang on Joi's box with IE9, http://crbug.com/105435. |
| 295 // Several other tests, e.g. URLRequestTestHTTP.CancelTest2, 3 and | 296 // Several other tests, e.g. URLRequestTestHTTP.CancelTest2, 3 and |
| 296 // 5, often hang but not always. | 297 // 5, often hang but not always. |
| (...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 890 // content::InitializeSandboxInfo(&sandbox_info); | 891 // content::InitializeSandboxInfo(&sandbox_info); |
| 891 FakeMainDelegate delegate; | 892 FakeMainDelegate delegate; |
| 892 content::ContentMain( | 893 content::ContentMain( |
| 893 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), | 894 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), |
| 894 &sandbox_info, | 895 &sandbox_info, |
| 895 &delegate); | 896 &delegate); |
| 896 | 897 |
| 897 // Note: In debug builds, we ExitProcess during PostDestroyThreads. | 898 // Note: In debug builds, we ExitProcess during PostDestroyThreads. |
| 898 return g_test_suite->test_result(); | 899 return g_test_suite->test_result(); |
| 899 } | 900 } |
| OLD | NEW |