| Index: chrome/test/ppapi/ppapi_browsertest.cc
|
| diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
|
| index d23323bd6e6fd4e4117354ab3709d2032f80c517..d153b06ae904a04b211268739e2c2f776a3abe70 100644
|
| --- a/chrome/test/ppapi/ppapi_browsertest.cc
|
| +++ b/chrome/test/ppapi/ppapi_browsertest.cc
|
| @@ -62,11 +62,25 @@ using content::RenderViewHost;
|
| #if defined(DISABLE_NACL)
|
|
|
| #define TEST_PPAPI_NACL(test_name)
|
| +#define TEST_PPAPI_NACL_NO_PNACL(test_name)
|
| #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name)
|
| #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name)
|
|
|
| #else
|
|
|
| +// TODO(dmichael): Remove this macro, crbug.com/384539
|
| +#define TEST_PPAPI_NACL_NO_PNACL(test_name) \
|
| + IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
|
| + RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
|
| + } \
|
| + IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(test_name)) { \
|
| + RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
|
| + } \
|
| + IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, \
|
| + MAYBE_PNACL_NONSFI(test_name)) { \
|
| + RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
|
| + }
|
| +
|
| // NaCl based PPAPI tests
|
| #define TEST_PPAPI_NACL(test_name) \
|
| IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
|
| @@ -1219,6 +1233,10 @@ TEST_PPAPI_NACL(VideoSource)
|
| // Printing doesn't work in content_browsertests.
|
| TEST_PPAPI_OUT_OF_PROCESS(Printing)
|
|
|
| +// TODO(dmichael): Make this work on PNaCl and remove the macro.
|
| +// crbug.com/384539
|
| +TEST_PPAPI_NACL_NO_PNACL(MessageHandler)
|
| +
|
| TEST_PPAPI_NACL(MessageLoop_Basics)
|
| TEST_PPAPI_NACL(MessageLoop_Post)
|
|
|
|
|