| 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 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 667 IN_PROC_BROWSER_TEST_F(PPAPIPrivateTest, MAYBE_FileIO_Private) { | 667 IN_PROC_BROWSER_TEST_F(PPAPIPrivateTest, MAYBE_FileIO_Private) { |
| 668 RUN_FILEIO_PRIVATE_SUBTESTS; | 668 RUN_FILEIO_PRIVATE_SUBTESTS; |
| 669 } | 669 } |
| 670 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FileIO) { | 670 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FileIO) { |
| 671 RUN_FILEIO_SUBTESTS; | 671 RUN_FILEIO_SUBTESTS; |
| 672 } | 672 } |
| 673 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPIPrivateTest, MAYBE_FileIO_Private) { | 673 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPIPrivateTest, MAYBE_FileIO_Private) { |
| 674 RUN_FILEIO_PRIVATE_SUBTESTS; | 674 RUN_FILEIO_PRIVATE_SUBTESTS; |
| 675 } | 675 } |
| 676 | 676 |
| 677 // Flaky on XP; times out, http://crbug.com/313401 | 677 // http://crbug.com/313401 |
| 678 #if defined(OS_WIN) | 678 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, DISABLED_FileIO) { |
| 679 #define MAYBE_NaCl_Newlib_FileIO DISABLED_FileIO | |
| 680 #define MAYBE_NaCl_Newlib_FileIO_Private DISABLED_FileIO_Private | |
| 681 #else | |
| 682 #define MAYBE_NaCl_Newlib_FileIO FileIO | |
| 683 #define MAYBE_NaCl_Newlib_FileIO_Private FileIO_Private | |
| 684 #endif | |
| 685 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_NaCl_Newlib_FileIO) { | |
| 686 RUN_FILEIO_SUBTESTS; | 679 RUN_FILEIO_SUBTESTS; |
| 687 } | 680 } |
| 688 IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClNewlibTest, | 681 IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClNewlibTest, |
| 689 MAYBE_NaCl_Newlib_FileIO_Private) { | 682 MAYBE_NaCl_Newlib_FileIO_Private) { |
| 690 RUN_FILEIO_PRIVATE_SUBTESTS; | 683 RUN_FILEIO_PRIVATE_SUBTESTS; |
| 691 } | 684 } |
| 692 | 685 |
| 693 // Flaky on 32-bit linux bot; http://crbug.com/308905 | 686 // Flaky on 32-bit linux bot; http://crbug.com/308905 |
| 694 // Flaky on Windows too; http://crbug.com/321300 | 687 // Flaky on Windows too; http://crbug.com/321300 |
| 695 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, DISABLED_FileIO) { | 688 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, DISABLED_FileIO) { |
| 696 RUN_FILEIO_SUBTESTS; | 689 RUN_FILEIO_SUBTESTS; |
| 697 } | 690 } |
| 698 IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClGLibcTest, DISABLED_FileIO_Private) { | 691 IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClGLibcTest, DISABLED_FileIO_Private) { |
| 699 RUN_FILEIO_PRIVATE_SUBTESTS; | 692 RUN_FILEIO_PRIVATE_SUBTESTS; |
| 700 } | 693 } |
| 701 | 694 |
| 702 // Flaky on XP; times out, http://crbug.com/313205 | 695 // http://crbug.com/313205 |
| 703 #if defined(OS_WIN) | 696 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, DISABLED_FileIO) { |
| 704 #define MAYBE_PNaCl_FileIO DISABLED_FileIO | |
| 705 #define MAYBE_PNaCl_FileIO_Private DISABLED_FileIO_Private | |
| 706 #else | |
| 707 #define MAYBE_PNaCl_FileIO FileIO | |
| 708 #define MAYBE_PNaCl_FileIO_Private FileIO_Private | |
| 709 #endif | |
| 710 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_PNaCl_FileIO) { | |
| 711 RUN_FILEIO_SUBTESTS; | 697 RUN_FILEIO_SUBTESTS; |
| 712 } | 698 } |
| 713 IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClPNaClTest, MAYBE_PNaCl_FileIO_Private) { | 699 IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClPNaClTest, MAYBE_PNaCl_FileIO_Private) { |
| 714 RUN_FILEIO_PRIVATE_SUBTESTS; | 700 RUN_FILEIO_PRIVATE_SUBTESTS; |
| 715 } | 701 } |
| 716 | 702 |
| 717 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, MAYBE_PNACL_NONSFI(FileIO)) { | 703 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, MAYBE_PNACL_NONSFI(FileIO)) { |
| 718 RUN_FILEIO_SUBTESTS; | 704 RUN_FILEIO_SUBTESTS; |
| 719 } | 705 } |
| 720 IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClPNaClTest, | 706 IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClPNaClTest, |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1021 } | 1007 } |
| 1022 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) { | 1008 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) { |
| 1023 RUN_WEBSOCKET_SUBTESTS_1; | 1009 RUN_WEBSOCKET_SUBTESTS_1; |
| 1024 } | 1010 } |
| 1025 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) { | 1011 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) { |
| 1026 RUN_WEBSOCKET_SUBTESTS_2; | 1012 RUN_WEBSOCKET_SUBTESTS_2; |
| 1027 } | 1013 } |
| 1028 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket1)) { | 1014 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket1)) { |
| 1029 RUN_WEBSOCKET_SUBTESTS_1; | 1015 RUN_WEBSOCKET_SUBTESTS_1; |
| 1030 } | 1016 } |
| 1017 #if !defined(OS_WIN) // http://crbug.com/396363 |
| 1031 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket2)) { | 1018 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket2)) { |
| 1032 RUN_WEBSOCKET_SUBTESTS_2; | 1019 RUN_WEBSOCKET_SUBTESTS_2; |
| 1033 } | 1020 } |
| 1021 #endif |
| 1034 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket1) { | 1022 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket1) { |
| 1035 RUN_WEBSOCKET_SUBTESTS_1; | 1023 RUN_WEBSOCKET_SUBTESTS_1; |
| 1036 } | 1024 } |
| 1037 // Flaky on XP Tests (3): http://crbug.com/389084 | 1025 // Flaky on XP Tests (3): http://crbug.com/389084 |
| 1038 #if defined(OS_WIN) | 1026 #if defined(OS_WIN) |
| 1039 #define MAYBE_WebSocket2 DISABLED_WebSocket2 | 1027 #define MAYBE_WebSocket2 DISABLED_WebSocket2 |
| 1040 #else | 1028 #else |
| 1041 #define MAYBE_WebSocket2 WebSocket2 | 1029 #define MAYBE_WebSocket2 WebSocket2 |
| 1042 #endif | 1030 #endif |
| 1043 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_WebSocket2) { | 1031 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_WebSocket2) { |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1346 LIST_TEST(FlashDRM_GetHmonitor) | 1334 LIST_TEST(FlashDRM_GetHmonitor) |
| 1347 LIST_TEST(FlashDRM_GetVoucherFile)); | 1335 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1348 } | 1336 } |
| 1349 | 1337 |
| 1350 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1338 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1351 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1339 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1352 | 1340 |
| 1353 #if defined(OS_CHROMEOS) | 1341 #if defined(OS_CHROMEOS) |
| 1354 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1342 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1355 #endif | 1343 #endif |
| OLD | NEW |