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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 } | 208 } |
209 | 209 |
210 TEST_PPAPI_IN_PROCESS(Console) | 210 TEST_PPAPI_IN_PROCESS(Console) |
211 TEST_PPAPI_OUT_OF_PROCESS(Console) | 211 TEST_PPAPI_OUT_OF_PROCESS(Console) |
212 TEST_PPAPI_NACL(Console) | 212 TEST_PPAPI_NACL(Console) |
213 | 213 |
214 TEST_PPAPI_IN_PROCESS(Core) | 214 TEST_PPAPI_IN_PROCESS(Core) |
215 TEST_PPAPI_OUT_OF_PROCESS(Core) | 215 TEST_PPAPI_OUT_OF_PROCESS(Core) |
216 TEST_PPAPI_NACL(Core) | 216 TEST_PPAPI_NACL(Core) |
217 | 217 |
| 218 TEST_PPAPI_IN_PROCESS(TraceEvent) |
| 219 TEST_PPAPI_OUT_OF_PROCESS(TraceEvent) |
| 220 TEST_PPAPI_NACL(TraceEvent) |
| 221 |
218 TEST_PPAPI_IN_PROCESS(InputEvent) | 222 TEST_PPAPI_IN_PROCESS(InputEvent) |
219 TEST_PPAPI_OUT_OF_PROCESS(InputEvent) | 223 TEST_PPAPI_OUT_OF_PROCESS(InputEvent) |
220 TEST_PPAPI_NACL(InputEvent) | 224 TEST_PPAPI_NACL(InputEvent) |
221 | 225 |
222 // Flaky on Linux and Windows. http://crbug.com/135403 | 226 // Flaky on Linux and Windows. http://crbug.com/135403 |
223 #if defined(OS_LINUX) || defined(OS_WIN) | 227 #if defined(OS_LINUX) || defined(OS_WIN) |
224 #define MAYBE_ImeInputEvent DISABLED_ImeInputEvent | 228 #define MAYBE_ImeInputEvent DISABLED_ImeInputEvent |
225 #else | 229 #else |
226 #define MAYBE_ImeInputEvent ImeInputEvent | 230 #define MAYBE_ImeInputEvent ImeInputEvent |
227 #endif | 231 #endif |
(...skipping 1222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1450 LIST_TEST(FlashDRM_GetDeviceID) | 1454 LIST_TEST(FlashDRM_GetDeviceID) |
1451 #endif | 1455 #endif |
1452 LIST_TEST(FlashDRM_GetHmonitor) | 1456 LIST_TEST(FlashDRM_GetHmonitor) |
1453 LIST_TEST(FlashDRM_GetVoucherFile)); | 1457 LIST_TEST(FlashDRM_GetVoucherFile)); |
1454 } | 1458 } |
1455 | 1459 |
1456 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1460 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
1457 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1461 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
1458 | 1462 |
1459 #endif // ADDRESS_SANITIZER | 1463 #endif // ADDRESS_SANITIZER |
OLD | NEW |