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/test/ppapi/ppapi_test.h" | 5 #include "chrome/test/ppapi/ppapi_test.h" |
6 | 6 |
7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "chrome/browser/content_settings/host_content_settings_map.h" | 9 #include "chrome/browser/content_settings/host_content_settings_map.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
605 LIST_TEST(PostMessage_NoHandler) \ | 605 LIST_TEST(PostMessage_NoHandler) \ |
606 LIST_TEST(PostMessage_ExtraParam) \ | 606 LIST_TEST(PostMessage_ExtraParam) \ |
607 LIST_TEST(PostMessage_NonMainThread) \ | 607 LIST_TEST(PostMessage_NonMainThread) \ |
608 ) | 608 ) |
609 | 609 |
610 // Windows defines 'PostMessage', so we have to undef it. | 610 // Windows defines 'PostMessage', so we have to undef it. |
611 #ifdef PostMessage | 611 #ifdef PostMessage |
612 #undef PostMessage | 612 #undef PostMessage |
613 #endif | 613 #endif |
614 | 614 |
615 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, PostMessage) { | 615 #if defined(OS_WIN) |
| 616 // http://crbug.com/95557 |
| 617 #define MAYBE_PostMessage DISABLED_PostMessage |
| 618 #else |
| 619 #define MAYBE_PostMessage PostMessage |
| 620 #endif |
| 621 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_PostMessage) { |
616 RUN_POSTMESSAGE_SUBTESTS; | 622 RUN_POSTMESSAGE_SUBTESTS; |
617 } | 623 } |
618 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, PostMessage) { | 624 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, PostMessage) { |
619 RUN_POSTMESSAGE_SUBTESTS; | 625 RUN_POSTMESSAGE_SUBTESTS; |
620 } | 626 } |
621 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(PostMessage)) { | 627 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(PostMessage)) { |
622 RUN_POSTMESSAGE_SUBTESTS; | 628 RUN_POSTMESSAGE_SUBTESTS; |
623 } | 629 } |
624 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, PostMessage) { | 630 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, PostMessage) { |
625 RUN_POSTMESSAGE_SUBTESTS; | 631 RUN_POSTMESSAGE_SUBTESTS; |
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1006 | 1012 |
1007 // Repeatedly flaky on Win7 Tests(1): http://crbug.com/389084 | 1013 // Repeatedly flaky on Win7 Tests(1): http://crbug.com/389084 |
1008 #if defined(OS_WIN) | 1014 #if defined(OS_WIN) |
1009 #define MAYBE_WebSocket2 DISABLED_WebSocket2 | 1015 #define MAYBE_WebSocket2 DISABLED_WebSocket2 |
1010 #else | 1016 #else |
1011 #define MAYBE_WebSocket2 WebSocket2 | 1017 #define MAYBE_WebSocket2 WebSocket2 |
1012 #endif | 1018 #endif |
1013 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_WebSocket2) { | 1019 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_WebSocket2) { |
1014 RUN_WEBSOCKET_SUBTESTS_2; | 1020 RUN_WEBSOCKET_SUBTESTS_2; |
1015 } | 1021 } |
| 1022 #if !defined(OS_WIN) // http://crbug.com/396399 |
1016 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket1) { | 1023 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket1) { |
1017 RUN_WEBSOCKET_SUBTESTS_1; | 1024 RUN_WEBSOCKET_SUBTESTS_1; |
1018 } | 1025 } |
1019 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket2) { | |
1020 RUN_WEBSOCKET_SUBTESTS_2; | |
1021 } | |
1022 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) { | 1026 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) { |
1023 RUN_WEBSOCKET_SUBTESTS_1; | 1027 RUN_WEBSOCKET_SUBTESTS_1; |
1024 } | 1028 } |
1025 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) { | |
1026 RUN_WEBSOCKET_SUBTESTS_2; | |
1027 } | |
1028 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket1)) { | 1029 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket1)) { |
1029 RUN_WEBSOCKET_SUBTESTS_1; | 1030 RUN_WEBSOCKET_SUBTESTS_1; |
1030 } | 1031 } |
1031 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket2)) { | |
1032 RUN_WEBSOCKET_SUBTESTS_2; | |
1033 } | |
1034 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket1) { | 1032 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket1) { |
1035 RUN_WEBSOCKET_SUBTESTS_1; | 1033 RUN_WEBSOCKET_SUBTESTS_1; |
1036 } | 1034 } |
| 1035 #endif |
| 1036 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket2) { |
| 1037 RUN_WEBSOCKET_SUBTESTS_2; |
| 1038 } |
| 1039 |
| 1040 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) { |
| 1041 RUN_WEBSOCKET_SUBTESTS_2; |
| 1042 } |
| 1043 |
| 1044 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket2)) { |
| 1045 RUN_WEBSOCKET_SUBTESTS_2; |
| 1046 } |
| 1047 |
1037 // Flaky on XP Tests (3): http://crbug.com/389084 | 1048 // Flaky on XP Tests (3): http://crbug.com/389084 |
1038 #if defined(OS_WIN) | 1049 #if defined(OS_WIN) |
1039 #define MAYBE_WebSocket2 DISABLED_WebSocket2 | 1050 #define MAYBE_WebSocket2 DISABLED_WebSocket2 |
1040 #else | 1051 #else |
1041 #define MAYBE_WebSocket2 WebSocket2 | 1052 #define MAYBE_WebSocket2 WebSocket2 |
1042 #endif | 1053 #endif |
1043 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_WebSocket2) { | 1054 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_WebSocket2) { |
1044 RUN_WEBSOCKET_SUBTESTS_2; | 1055 RUN_WEBSOCKET_SUBTESTS_2; |
1045 } | 1056 } |
1046 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 1057 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1272 #define MAYBE_Compositor0 DISABLED_Compositor0 | 1283 #define MAYBE_Compositor0 DISABLED_Compositor0 |
1273 #define MAYBE_Compositor1 DISABLED_Compositor1 | 1284 #define MAYBE_Compositor1 DISABLED_Compositor1 |
1274 #else | 1285 #else |
1275 #define MAYBE_Compositor0 Compositor0 | 1286 #define MAYBE_Compositor0 Compositor0 |
1276 #define MAYBE_Compositor1 Compositor1 | 1287 #define MAYBE_Compositor1 Compositor1 |
1277 #endif | 1288 #endif |
1278 | 1289 |
1279 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) | 1290 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) |
1280 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) | 1291 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) |
1281 | 1292 |
1282 TEST_PPAPI_NACL(MediaStreamAudioTrack) | 1293 // http://crbug.com/396395 |
| 1294 TEST_PPAPI_NACL(DISABLED_MediaStreamAudioTrack) |
1283 | 1295 |
1284 TEST_PPAPI_NACL(MediaStreamVideoTrack) | 1296 TEST_PPAPI_NACL(MediaStreamVideoTrack) |
1285 | 1297 |
1286 TEST_PPAPI_NACL(MouseCursor) | 1298 TEST_PPAPI_NACL(MouseCursor) |
1287 | 1299 |
1288 TEST_PPAPI_NACL(NetworkProxy) | 1300 TEST_PPAPI_NACL(NetworkProxy) |
1289 | 1301 |
1290 TEST_PPAPI_NACL(TrueTypeFont) | 1302 TEST_PPAPI_NACL(TrueTypeFont) |
1291 | 1303 |
1292 TEST_PPAPI_NACL(VideoDecoder) | 1304 TEST_PPAPI_NACL(VideoDecoder) |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1346 LIST_TEST(FlashDRM_GetHmonitor) | 1358 LIST_TEST(FlashDRM_GetHmonitor) |
1347 LIST_TEST(FlashDRM_GetVoucherFile)); | 1359 LIST_TEST(FlashDRM_GetVoucherFile)); |
1348 } | 1360 } |
1349 | 1361 |
1350 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1362 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
1351 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1363 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
1352 | 1364 |
1353 #if defined(OS_CHROMEOS) | 1365 #if defined(OS_CHROMEOS) |
1354 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1366 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
1355 #endif | 1367 #endif |
OLD | NEW |