| 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 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1270 #define MAYBE_Compositor0 DISABLED_Compositor0 | 1270 #define MAYBE_Compositor0 DISABLED_Compositor0 |
| 1271 #define MAYBE_Compositor1 DISABLED_Compositor1 | 1271 #define MAYBE_Compositor1 DISABLED_Compositor1 |
| 1272 #else | 1272 #else |
| 1273 #define MAYBE_Compositor0 Compositor0 | 1273 #define MAYBE_Compositor0 Compositor0 |
| 1274 #define MAYBE_Compositor1 Compositor1 | 1274 #define MAYBE_Compositor1 Compositor1 |
| 1275 #endif | 1275 #endif |
| 1276 | 1276 |
| 1277 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) | 1277 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) |
| 1278 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) | 1278 TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) |
| 1279 | 1279 |
| 1280 // http://crbug.com/396395 | 1280 TEST_PPAPI_NACL(MediaStreamAudioTrack) |
| 1281 TEST_PPAPI_NACL(DISABLED_MediaStreamAudioTrack) | |
| 1282 | 1281 |
| 1283 TEST_PPAPI_NACL(MediaStreamVideoTrack) | 1282 TEST_PPAPI_NACL(MediaStreamVideoTrack) |
| 1284 | 1283 |
| 1285 TEST_PPAPI_NACL(MouseCursor) | 1284 TEST_PPAPI_NACL(MouseCursor) |
| 1286 | 1285 |
| 1287 TEST_PPAPI_NACL(NetworkProxy) | 1286 TEST_PPAPI_NACL(NetworkProxy) |
| 1288 | 1287 |
| 1289 TEST_PPAPI_NACL(TrueTypeFont) | 1288 TEST_PPAPI_NACL(TrueTypeFont) |
| 1290 | 1289 |
| 1291 TEST_PPAPI_NACL(VideoDecoder) | 1290 TEST_PPAPI_NACL(VideoDecoder) |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1346 LIST_TEST(FlashDRM_GetHmonitor) | 1345 LIST_TEST(FlashDRM_GetHmonitor) |
| 1347 LIST_TEST(FlashDRM_GetVoucherFile)); | 1346 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1348 } | 1347 } |
| 1349 | 1348 |
| 1350 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1349 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1351 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1350 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1352 | 1351 |
| 1353 #if defined(OS_CHROMEOS) | 1352 #if defined(OS_CHROMEOS) |
| 1354 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1353 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1355 #endif | 1354 #endif |
| OLD | NEW |