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 1190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1201 } | 1201 } |
1202 #if defined(OS_LINUX) // Disabled due to flakiness http://crbug.com/316925 | 1202 #if defined(OS_LINUX) // Disabled due to flakiness http://crbug.com/316925 |
1203 #define MAYBE_FlashMessageLoop DISABLED_FlashMessageLoop | 1203 #define MAYBE_FlashMessageLoop DISABLED_FlashMessageLoop |
1204 #else | 1204 #else |
1205 #define MAYBE_FlashMessageLoop FlashMessageLoop | 1205 #define MAYBE_FlashMessageLoop FlashMessageLoop |
1206 #endif | 1206 #endif |
1207 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { | 1207 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { |
1208 RUN_FLASH_MESSAGE_LOOP_SUBTESTS; | 1208 RUN_FLASH_MESSAGE_LOOP_SUBTESTS; |
1209 } | 1209 } |
1210 | 1210 |
| 1211 #if defined(OS_WIN) |
| 1212 // This test fails with the test compositor which is what's used by default for |
| 1213 // browser tests on Windows. Renable when the software compositor is available. |
| 1214 #define MAYBE_Compositor DISABLED_Compositor |
| 1215 #elif defined(OS_MACOSX) |
| 1216 // This test fails when using the legacy software mode. Reenable when the |
| 1217 // software compositor is enabled crbug.com/286038 |
| 1218 #define MAYBE_Compositor DISABLED_Compositor |
| 1219 #else |
| 1220 #define MAYBE_Compositor Compositor |
| 1221 #endif |
| 1222 TEST_PPAPI_NACL(MAYBE_Compositor) |
| 1223 |
1211 TEST_PPAPI_NACL(MediaStreamAudioTrack) | 1224 TEST_PPAPI_NACL(MediaStreamAudioTrack) |
1212 | 1225 |
1213 TEST_PPAPI_NACL(MediaStreamVideoTrack) | 1226 TEST_PPAPI_NACL(MediaStreamVideoTrack) |
1214 | 1227 |
1215 TEST_PPAPI_NACL(MouseCursor) | 1228 TEST_PPAPI_NACL(MouseCursor) |
1216 | 1229 |
1217 TEST_PPAPI_NACL(NetworkProxy) | 1230 TEST_PPAPI_NACL(NetworkProxy) |
1218 | 1231 |
1219 TEST_PPAPI_NACL(TrueTypeFont) | 1232 TEST_PPAPI_NACL(TrueTypeFont) |
1220 | 1233 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1275 LIST_TEST(FlashDRM_GetHmonitor) | 1288 LIST_TEST(FlashDRM_GetHmonitor) |
1276 LIST_TEST(FlashDRM_GetVoucherFile)); | 1289 LIST_TEST(FlashDRM_GetVoucherFile)); |
1277 } | 1290 } |
1278 | 1291 |
1279 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1292 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
1280 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1293 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
1281 | 1294 |
1282 #if defined(OS_CHROMEOS) | 1295 #if defined(OS_CHROMEOS) |
1283 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1296 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
1284 #endif | 1297 #endif |
OLD | NEW |