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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
994 | 1000 |
995 // Repeatedly flaky on Win7 Tests(1): http://crbug.com/389084 | 1001 // Repeatedly flaky on Win7 Tests(1): http://crbug.com/389084 |
996 #if defined(OS_WIN) | 1002 #if defined(OS_WIN) |
997 #define MAYBE_WebSocket2 DISABLED_WebSocket2 | 1003 #define MAYBE_WebSocket2 DISABLED_WebSocket2 |
998 #else | 1004 #else |
999 #define MAYBE_WebSocket2 WebSocket2 | 1005 #define MAYBE_WebSocket2 WebSocket2 |
1000 #endif | 1006 #endif |
1001 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_WebSocket2) { | 1007 IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_WebSocket2) { |
1002 RUN_WEBSOCKET_SUBTESTS_2; | 1008 RUN_WEBSOCKET_SUBTESTS_2; |
1003 } | 1009 } |
| 1010 #if !defined(OS_WIN) // http://crbug.com/396399 |
1004 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket1) { | 1011 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket1) { |
1005 RUN_WEBSOCKET_SUBTESTS_1; | 1012 RUN_WEBSOCKET_SUBTESTS_1; |
1006 } | 1013 } |
1007 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket2) { | |
1008 RUN_WEBSOCKET_SUBTESTS_2; | |
1009 } | |
1010 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) { | 1014 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) { |
1011 RUN_WEBSOCKET_SUBTESTS_1; | 1015 RUN_WEBSOCKET_SUBTESTS_1; |
1012 } | 1016 } |
| 1017 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket1)) { |
| 1018 RUN_WEBSOCKET_SUBTESTS_1; |
| 1019 } |
| 1020 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket2)) { |
| 1021 RUN_WEBSOCKET_SUBTESTS_2; |
| 1022 } |
| 1023 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket1) { |
| 1024 RUN_WEBSOCKET_SUBTESTS_1; |
| 1025 } |
| 1026 #endif |
| 1027 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket2) { |
| 1028 RUN_WEBSOCKET_SUBTESTS_2; |
| 1029 } |
| 1030 |
1013 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) { | 1031 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) { |
1014 RUN_WEBSOCKET_SUBTESTS_2; | 1032 RUN_WEBSOCKET_SUBTESTS_2; |
1015 } | 1033 } |
1016 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket1)) { | 1034 |
1017 RUN_WEBSOCKET_SUBTESTS_1; | |
1018 } | |
1019 #if !defined(OS_WIN) // http://crbug.com/396363 | |
1020 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket2)) { | 1035 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket2)) { |
1021 RUN_WEBSOCKET_SUBTESTS_2; | 1036 RUN_WEBSOCKET_SUBTESTS_2; |
1022 } | 1037 } |
1023 #endif | 1038 |
1024 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket1) { | |
1025 RUN_WEBSOCKET_SUBTESTS_1; | |
1026 } | |
1027 // Flaky on XP Tests (3): http://crbug.com/389084 | 1039 // Flaky on XP Tests (3): http://crbug.com/389084 |
1028 #if defined(OS_WIN) | 1040 #if defined(OS_WIN) |
1029 #define MAYBE_WebSocket2 DISABLED_WebSocket2 | 1041 #define MAYBE_WebSocket2 DISABLED_WebSocket2 |
1030 #else | 1042 #else |
1031 #define MAYBE_WebSocket2 WebSocket2 | 1043 #define MAYBE_WebSocket2 WebSocket2 |
1032 #endif | 1044 #endif |
1033 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_WebSocket2) { | 1045 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_WebSocket2) { |
1034 RUN_WEBSOCKET_SUBTESTS_2; | 1046 RUN_WEBSOCKET_SUBTESTS_2; |
1035 } | 1047 } |
1036 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 1048 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1262 #define MAYBE_Compositor0 DISABLED_Compositor0 | 1274 #define MAYBE_Compositor0 DISABLED_Compositor0 |
1263 #define MAYBE_Compositor1 DISABLED_Compositor1 | 1275 #define MAYBE_Compositor1 DISABLED_Compositor1 |
1264 #else | 1276 #else |
1265 #define MAYBE_Compositor0 Compositor0 | 1277 #define MAYBE_Compositor0 Compositor0 |
1266 #define MAYBE_Compositor1 Compositor1 | 1278 #define MAYBE_Compositor1 Compositor1 |
1267 #endif | 1279 #endif |
1268 | 1280 |
1269 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) | 1281 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) |
1270 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) | 1282 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) |
1271 | 1283 |
1272 TEST_PPAPI_NACL(MediaStreamAudioTrack) | 1284 // http://crbug.com/396395 |
| 1285 TEST_PPAPI_NACL(DISABLED_MediaStreamAudioTrack) |
1273 | 1286 |
1274 TEST_PPAPI_NACL(MediaStreamVideoTrack) | 1287 TEST_PPAPI_NACL(MediaStreamVideoTrack) |
1275 | 1288 |
1276 TEST_PPAPI_NACL(MouseCursor) | 1289 TEST_PPAPI_NACL(MouseCursor) |
1277 | 1290 |
1278 TEST_PPAPI_NACL(NetworkProxy) | 1291 TEST_PPAPI_NACL(NetworkProxy) |
1279 | 1292 |
1280 TEST_PPAPI_NACL(TrueTypeFont) | 1293 TEST_PPAPI_NACL(TrueTypeFont) |
1281 | 1294 |
1282 TEST_PPAPI_NACL(VideoDecoder) | 1295 TEST_PPAPI_NACL(VideoDecoder) |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1337 LIST_TEST(FlashDRM_GetHmonitor) | 1350 LIST_TEST(FlashDRM_GetHmonitor) |
1338 LIST_TEST(FlashDRM_GetVoucherFile)); | 1351 LIST_TEST(FlashDRM_GetVoucherFile)); |
1339 } | 1352 } |
1340 | 1353 |
1341 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1354 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
1342 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1355 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
1343 | 1356 |
1344 #if defined(OS_CHROMEOS) | 1357 #if defined(OS_CHROMEOS) |
1345 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1358 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
1346 #endif | 1359 #endif |
OLD | NEW |