Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Side by Side Diff: chrome/test/ppapi/ppapi_browsertest.cc

Issue 564573002: PPAPI: Make PPP_MessageHandler work in PNaCl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ 55 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
56 } 56 }
57 #define TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(test_name) \ 57 #define TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(test_name) \
58 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \ 58 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \
59 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ 59 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
60 } 60 }
61 61
62 #if defined(DISABLE_NACL) 62 #if defined(DISABLE_NACL)
63 63
64 #define TEST_PPAPI_NACL(test_name) 64 #define TEST_PPAPI_NACL(test_name)
65 #define TEST_PPAPI_NACL_NO_PNACL(test_name)
66 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) 65 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name)
67 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) 66 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name)
68 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement) 67 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement)
69 68
70 #else 69 #else
71 70
72 // TODO(dmichael): Remove this macro, crbug.com/384539
73 #define TEST_PPAPI_NACL_NO_PNACL(test_name) \
74 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
75 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
76 } \
77 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \
78 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
79 } \
80
81 // NaCl based PPAPI tests 71 // NaCl based PPAPI tests
82 #define TEST_PPAPI_NACL(test_name) \ 72 #define TEST_PPAPI_NACL(test_name) \
83 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \ 73 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
84 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ 74 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
85 } \ 75 } \
86 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \ 76 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \
87 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ 77 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
88 } \ 78 } \
89 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \ 79 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \
90 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ 80 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
(...skipping 1190 matching lines...) Expand 10 before | Expand all | Expand 10 after
1281 TEST_PPAPI_OUT_OF_PROCESS(VideoDestination) 1271 TEST_PPAPI_OUT_OF_PROCESS(VideoDestination)
1282 TEST_PPAPI_NACL(VideoDestination) 1272 TEST_PPAPI_NACL(VideoDestination)
1283 1273
1284 // VideoSource doesn't work in content_browsertests. 1274 // VideoSource doesn't work in content_browsertests.
1285 TEST_PPAPI_OUT_OF_PROCESS(VideoSource) 1275 TEST_PPAPI_OUT_OF_PROCESS(VideoSource)
1286 TEST_PPAPI_NACL(VideoSource) 1276 TEST_PPAPI_NACL(VideoSource)
1287 1277
1288 // Printing doesn't work in content_browsertests. 1278 // Printing doesn't work in content_browsertests.
1289 TEST_PPAPI_OUT_OF_PROCESS(Printing) 1279 TEST_PPAPI_OUT_OF_PROCESS(Printing)
1290 1280
1291 // TODO(dmichael): Make this work on PNaCl and remove the macro. 1281 TEST_PPAPI_NACL(MessageHandler)
1292 // crbug.com/384539
1293 TEST_PPAPI_NACL_NO_PNACL(MessageHandler)
1294 1282
1295 TEST_PPAPI_NACL(MessageLoop_Basics) 1283 TEST_PPAPI_NACL(MessageLoop_Basics)
1296 TEST_PPAPI_NACL(MessageLoop_Post) 1284 TEST_PPAPI_NACL(MessageLoop_Post)
1297 1285
1298 // Going forward, Flash APIs will only work out-of-process. 1286 // Going forward, Flash APIs will only work out-of-process.
1299 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset) 1287 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset)
1300 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL) 1288 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL)
1301 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting) 1289 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting)
1302 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData) 1290 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData)
1303 // http://crbug.com/176822 1291 // http://crbug.com/176822
(...skipping 29 matching lines...) Expand all
1333 LIST_TEST(FlashDRM_GetHmonitor) 1321 LIST_TEST(FlashDRM_GetHmonitor)
1334 LIST_TEST(FlashDRM_GetVoucherFile)); 1322 LIST_TEST(FlashDRM_GetVoucherFile));
1335 } 1323 }
1336 1324
1337 TEST_PPAPI_IN_PROCESS(TalkPrivate) 1325 TEST_PPAPI_IN_PROCESS(TalkPrivate)
1338 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 1326 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
1339 1327
1340 #if defined(OS_CHROMEOS) 1328 #if defined(OS_CHROMEOS)
1341 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) 1329 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate)
1342 #endif 1330 #endif
OLDNEW
« no previous file with comments | « chrome/browser/component_updater/ppapi_utils.cc ('k') | content/renderer/pepper/pepper_plugin_instance_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698