| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 #else | 69 #else |
| 70 | 70 |
| 71 // TODO(dmichael): Remove this macro, crbug.com/384539 | 71 // TODO(dmichael): Remove this macro, crbug.com/384539 |
| 72 #define TEST_PPAPI_NACL_NO_PNACL(test_name) \ | 72 #define TEST_PPAPI_NACL_NO_PNACL(test_name) \ |
| 73 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ | 73 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ |
| 74 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | 74 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ |
| 75 } \ | 75 } \ |
| 76 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \ | 76 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \ |
| 77 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | 77 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ |
| 78 } \ | 78 } \ |
| 79 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, \ | |
| 80 MAYBE_PNACL_NONSFI(test_name)) { \ | |
| 81 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | |
| 82 } | |
| 83 | 79 |
| 84 // NaCl based PPAPI tests | 80 // NaCl based PPAPI tests |
| 85 #define TEST_PPAPI_NACL(test_name) \ | 81 #define TEST_PPAPI_NACL(test_name) \ |
| 86 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ | 82 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ |
| 87 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | 83 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ |
| 88 } \ | 84 } \ |
| 89 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \ | 85 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \ |
| 90 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | 86 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ |
| 91 } \ | 87 } \ |
| 92 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \ | 88 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \ |
| (...skipping 1185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1278 LIST_TEST(FlashDRM_GetHmonitor) | 1274 LIST_TEST(FlashDRM_GetHmonitor) |
| 1279 LIST_TEST(FlashDRM_GetVoucherFile)); | 1275 LIST_TEST(FlashDRM_GetVoucherFile)); |
| 1280 } | 1276 } |
| 1281 | 1277 |
| 1282 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1278 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
| 1283 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1279 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
| 1284 | 1280 |
| 1285 #if defined(OS_CHROMEOS) | 1281 #if defined(OS_CHROMEOS) |
| 1286 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1282 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
| 1287 #endif | 1283 #endif |
| OLD | NEW |