Chromium Code Reviews| 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 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1085 RunTestViaHTTP( \ | 1085 RunTestViaHTTP( \ |
| 1086 LIST_TEST(Audio_Creation) \ | 1086 LIST_TEST(Audio_Creation) \ |
| 1087 LIST_TEST(Audio_DestroyNoStop) \ | 1087 LIST_TEST(Audio_DestroyNoStop) \ |
| 1088 LIST_TEST(Audio_Failures) \ | 1088 LIST_TEST(Audio_Failures) \ |
| 1089 LIST_TEST(Audio_AudioCallback1) \ | 1089 LIST_TEST(Audio_AudioCallback1) \ |
| 1090 LIST_TEST(Audio_AudioCallback2) \ | 1090 LIST_TEST(Audio_AudioCallback2) \ |
| 1091 LIST_TEST(Audio_AudioCallback3) \ | 1091 LIST_TEST(Audio_AudioCallback3) \ |
| 1092 LIST_TEST(Audio_AudioCallback4) \ | 1092 LIST_TEST(Audio_AudioCallback4) \ |
| 1093 ) | 1093 ) |
| 1094 | 1094 |
| 1095 #if defined(OS_LINUX) | |
| 1096 // http://crbug.com/396464 | |
| 1097 #define MAYBE_Audio DISABLED_Audio | |
| 1098 #else | |
| 1099 #define MAYBE_Audio Audio | |
| 1100 #endif | |
| 1095 // PPB_Audio is not supported in-process. | 1101 // PPB_Audio is not supported in-process. |
| 1096 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, Audio) { | 1102 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_Audio) { |
| 1097 RUN_AUDIO_SUBTESTS; | 1103 RUN_AUDIO_SUBTESTS; |
| 1098 } | 1104 } |
| 1099 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, Audio) { | 1105 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, Audio) { |
| 1100 RUN_AUDIO_SUBTESTS; | 1106 RUN_AUDIO_SUBTESTS; |
| 1101 } | 1107 } |
| 1102 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(Audio)) { | 1108 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(Audio)) { |
| 1103 RUN_AUDIO_SUBTESTS; | 1109 RUN_AUDIO_SUBTESTS; |
| 1104 } | 1110 } |
| 1105 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, Audio) { | 1111 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, Audio) { |
| 1106 RUN_AUDIO_SUBTESTS; | 1112 RUN_AUDIO_SUBTESTS; |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1265 // This test fails with the test compositor which is what's used by default for | 1271 // This test fails with the test compositor which is what's used by default for |
| 1266 // browser tests on Windows. Renable when the software compositor is available. | 1272 // browser tests on Windows. Renable when the software compositor is available. |
| 1267 #define MAYBE_Compositor0 DISABLED_Compositor0 | 1273 #define MAYBE_Compositor0 DISABLED_Compositor0 |
| 1268 #define MAYBE_Compositor1 DISABLED_Compositor1 | 1274 #define MAYBE_Compositor1 DISABLED_Compositor1 |
| 1269 #elif defined(OS_MACOSX) | 1275 #elif defined(OS_MACOSX) |
| 1270 // This test fails when using the legacy software mode. Reenable when the | 1276 // This test fails when using the legacy software mode. Reenable when the |
| 1271 // software compositor is enabled crbug.com/286038 | 1277 // software compositor is enabled crbug.com/286038 |
| 1272 #define MAYBE_Compositor0 DISABLED_Compositor0 | 1278 #define MAYBE_Compositor0 DISABLED_Compositor0 |
| 1273 #define MAYBE_Compositor1 DISABLED_Compositor1 | 1279 #define MAYBE_Compositor1 DISABLED_Compositor1 |
| 1274 #else | 1280 #else |
| 1275 #define MAYBE_Compositor0 Compositor0 | 1281 // flaky on Linux: http://crbug.com/396482 |
|
viettrungluu
2014/07/23 15:26:42
Impressive that we've disabled these on all platfo
| |
| 1276 #define MAYBE_Compositor1 Compositor1 | 1282 #define MAYBE_Compositor0 DISABLED_Compositor0 |
| 1283 #define MAYBE_Compositor1 DISABLED_Compositor1 | |
| 1277 #endif | 1284 #endif |
| 1278 | 1285 |
| 1279 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) | 1286 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) |
| 1280 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) | 1287 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) |
| 1281 | 1288 |
| 1282 TEST_PPAPI_NACL(MediaStreamAudioTrack) | 1289 TEST_PPAPI_NACL(MediaStreamAudioTrack) |
| 1283 | 1290 |
| 1284 TEST_PPAPI_NACL(MediaStreamVideoTrack) | 1291 TEST_PPAPI_NACL(MediaStreamVideoTrack) |
| 1285 | 1292 |
| 1286 TEST_PPAPI_NACL(MouseCursor) | 1293 TEST_PPAPI_NACL(MouseCursor) |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1346 LIST_TEST(FlashDRM_GetHmonitor) | 1353 LIST_TEST(FlashDRM_GetHmonitor) |
| 1347 LIST_TEST(FlashDRM_GetVoucherFile)); | 1354 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1348 } | 1355 } |
| 1349 | 1356 |
| 1350 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1357 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1351 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1358 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1352 | 1359 |
| 1353 #if defined(OS_CHROMEOS) | 1360 #if defined(OS_CHROMEOS) |
| 1354 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1361 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1355 #endif | 1362 #endif |
| OLD | NEW |