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 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1189 } | 1189 } |
1190 #if defined(OS_LINUX) // Disabled due to flakiness http://crbug.com/316925 | 1190 #if defined(OS_LINUX) // Disabled due to flakiness http://crbug.com/316925 |
1191 #define MAYBE_FlashMessageLoop DISABLED_FlashMessageLoop | 1191 #define MAYBE_FlashMessageLoop DISABLED_FlashMessageLoop |
1192 #else | 1192 #else |
1193 #define MAYBE_FlashMessageLoop FlashMessageLoop | 1193 #define MAYBE_FlashMessageLoop FlashMessageLoop |
1194 #endif | 1194 #endif |
1195 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { | 1195 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { |
1196 RUN_FLASH_MESSAGE_LOOP_SUBTESTS; | 1196 RUN_FLASH_MESSAGE_LOOP_SUBTESTS; |
1197 } | 1197 } |
1198 | 1198 |
1199 #if defined(OS_WIN) && defined(USE_AURA) | |
raymes
2014/06/18 05:58:44
It seems quite important to have testing on Window
Peng
2014/06/18 11:14:36
I have no idea. On the windows trybot, Graphics3D
raymes
2014/06/19 00:39:13
Ah yes I see that the Graphics3D tests are disable
piman
2014/06/19 01:21:21
Not sure. If it's disabled on Windows but not Linu
Peng
2014/06/19 20:04:48
We can do it. But it need create a special test wh
| |
1200 // These tests fail with the test compositor which is what's used by default for | |
1201 // browser tests on Windows Aura. Renable when the software compositor is | |
1202 // available. | |
1203 #define MAYBE_Compositor DISABLED_Compositor | |
1204 #else // defined(OS_WIN) && defined(USE_AURA) | |
1205 #define MAYBE_Compositor Compositor | |
1206 #endif // defined(OS_WIN) && defined(USE_AURA) | |
1207 TEST_PPAPI_NACL(MAYBE_Compositor) | |
1208 | |
1199 TEST_PPAPI_NACL(MediaStreamAudioTrack) | 1209 TEST_PPAPI_NACL(MediaStreamAudioTrack) |
1200 | 1210 |
1201 TEST_PPAPI_NACL(MediaStreamVideoTrack) | 1211 TEST_PPAPI_NACL(MediaStreamVideoTrack) |
1202 | 1212 |
1203 TEST_PPAPI_NACL(MouseCursor) | 1213 TEST_PPAPI_NACL(MouseCursor) |
1204 | 1214 |
1205 TEST_PPAPI_NACL(NetworkProxy) | 1215 TEST_PPAPI_NACL(NetworkProxy) |
1206 | 1216 |
1207 TEST_PPAPI_NACL(TrueTypeFont) | 1217 TEST_PPAPI_NACL(TrueTypeFont) |
1208 | 1218 |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1259 LIST_TEST(FlashDRM_GetHmonitor) | 1269 LIST_TEST(FlashDRM_GetHmonitor) |
1260 LIST_TEST(FlashDRM_GetVoucherFile)); | 1270 LIST_TEST(FlashDRM_GetVoucherFile)); |
1261 } | 1271 } |
1262 | 1272 |
1263 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1273 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
1264 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1274 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
1265 | 1275 |
1266 #if defined(OS_CHROMEOS) | 1276 #if defined(OS_CHROMEOS) |
1267 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1277 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
1268 #endif | 1278 #endif |
OLD | NEW |