| 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 1049 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1060 RunTestViaHTTP( \ | 1060 RunTestViaHTTP( \ |
| 1061 LIST_TEST(Audio_Creation) \ | 1061 LIST_TEST(Audio_Creation) \ |
| 1062 LIST_TEST(Audio_DestroyNoStop) \ | 1062 LIST_TEST(Audio_DestroyNoStop) \ |
| 1063 LIST_TEST(Audio_Failures) \ | 1063 LIST_TEST(Audio_Failures) \ |
| 1064 LIST_TEST(Audio_AudioCallback1) \ | 1064 LIST_TEST(Audio_AudioCallback1) \ |
| 1065 LIST_TEST(Audio_AudioCallback2) \ | 1065 LIST_TEST(Audio_AudioCallback2) \ |
| 1066 LIST_TEST(Audio_AudioCallback3) \ | 1066 LIST_TEST(Audio_AudioCallback3) \ |
| 1067 LIST_TEST(Audio_AudioCallback4) \ | 1067 LIST_TEST(Audio_AudioCallback4) \ |
| 1068 ) | 1068 ) |
| 1069 | 1069 |
| 1070 #if defined(OS_LINUX) |
| 1071 // http://crbug.com/396464 |
| 1072 #define MAYBE_Audio DISABLED_Audio |
| 1073 #else |
| 1074 #define MAYBE_Audio Audio |
| 1075 #endif |
| 1070 // PPB_Audio is not supported in-process. | 1076 // PPB_Audio is not supported in-process. |
| 1071 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, Audio) { | 1077 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_Audio) { |
| 1072 RUN_AUDIO_SUBTESTS; | 1078 RUN_AUDIO_SUBTESTS; |
| 1073 } | 1079 } |
| 1074 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, Audio) { | 1080 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, Audio) { |
| 1075 RUN_AUDIO_SUBTESTS; | 1081 RUN_AUDIO_SUBTESTS; |
| 1076 } | 1082 } |
| 1077 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(Audio)) { | 1083 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(Audio)) { |
| 1078 RUN_AUDIO_SUBTESTS; | 1084 RUN_AUDIO_SUBTESTS; |
| 1079 } | 1085 } |
| 1080 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, Audio) { | 1086 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, Audio) { |
| 1081 RUN_AUDIO_SUBTESTS; | 1087 RUN_AUDIO_SUBTESTS; |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1240 // This test fails with the test compositor which is what's used by default for | 1246 // This test fails with the test compositor which is what's used by default for |
| 1241 // browser tests on Windows. Renable when the software compositor is available. | 1247 // browser tests on Windows. Renable when the software compositor is available. |
| 1242 #define MAYBE_Compositor0 DISABLED_Compositor0 | 1248 #define MAYBE_Compositor0 DISABLED_Compositor0 |
| 1243 #define MAYBE_Compositor1 DISABLED_Compositor1 | 1249 #define MAYBE_Compositor1 DISABLED_Compositor1 |
| 1244 #elif defined(OS_MACOSX) | 1250 #elif defined(OS_MACOSX) |
| 1245 // This test fails when using the legacy software mode. Reenable when the | 1251 // This test fails when using the legacy software mode. Reenable when the |
| 1246 // software compositor is enabled crbug.com/286038 | 1252 // software compositor is enabled crbug.com/286038 |
| 1247 #define MAYBE_Compositor0 DISABLED_Compositor0 | 1253 #define MAYBE_Compositor0 DISABLED_Compositor0 |
| 1248 #define MAYBE_Compositor1 DISABLED_Compositor1 | 1254 #define MAYBE_Compositor1 DISABLED_Compositor1 |
| 1249 #else | 1255 #else |
| 1250 #define MAYBE_Compositor0 Compositor0 | 1256 // flaky on Linux: http://crbug.com/396482 |
| 1251 #define MAYBE_Compositor1 Compositor1 | 1257 #define MAYBE_Compositor0 DISABLED_Compositor0 |
| 1258 #define MAYBE_Compositor1 DISABLED_Compositor1 |
| 1252 #endif | 1259 #endif |
| 1253 | 1260 |
| 1254 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) | 1261 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) |
| 1255 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) | 1262 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) |
| 1256 | 1263 |
| 1257 TEST_PPAPI_NACL(MediaStreamAudioTrack) | 1264 TEST_PPAPI_NACL(MediaStreamAudioTrack) |
| 1258 | 1265 |
| 1259 TEST_PPAPI_NACL(MediaStreamVideoTrack) | 1266 TEST_PPAPI_NACL(MediaStreamVideoTrack) |
| 1260 | 1267 |
| 1261 TEST_PPAPI_NACL(MouseCursor) | 1268 TEST_PPAPI_NACL(MouseCursor) |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1322 LIST_TEST(FlashDRM_GetHmonitor) | 1329 LIST_TEST(FlashDRM_GetHmonitor) |
| 1323 LIST_TEST(FlashDRM_GetVoucherFile)); | 1330 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1324 } | 1331 } |
| 1325 | 1332 |
| 1326 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1333 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1327 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1334 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1328 | 1335 |
| 1329 #if defined(OS_CHROMEOS) | 1336 #if defined(OS_CHROMEOS) |
| 1330 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1337 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1331 #endif | 1338 #endif |
| OLD | NEW |