| Index: chrome/test/nacl/nacl_browsertest.cc
|
| diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
|
| index 9b6168c999257a3b8a4f0b8c6ec00d09dd9f337d..d8d5f4228f2107eebd83cf9ab74e5e41e1fb35e6 100644
|
| --- a/chrome/test/nacl/nacl_browsertest.cc
|
| +++ b/chrome/test/nacl/nacl_browsertest.cc
|
| @@ -37,25 +37,11 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, {
|
| RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html"));
|
| })
|
|
|
| -// ASan does not work with libc-free context, so disable the test.
|
| -#if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER)
|
| -# define MAYBE_NonSfiMessaging NonSfiMessaging
|
| -#else
|
| -# define MAYBE_NonSfiMessaging DISABLED_NonSfiMessaging
|
| -#endif
|
| -
|
| -IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NonSfiMessaging) {
|
| +IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Messaging)) {
|
| RunLoadTest(FILE_PATH_LITERAL("libc_free.html"));
|
| }
|
|
|
| -// ASan does not work with libc-free context, so disable the test.
|
| -#if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER)
|
| -# define MAYBE_NonSfiIrt NonSfiIrt
|
| -#else
|
| -# define MAYBE_NonSfiIrt DISABLED_NonSfiIrt
|
| -#endif
|
| -
|
| -IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NonSfiIrt) {
|
| +IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Irt)) {
|
| RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html"));
|
| }
|
|
|
| @@ -143,6 +129,10 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, PreInitManifestFile) {
|
| IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) {
|
| RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
|
| }
|
| +IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
|
| + MAYBE_PNACL_NONSFI(IrtManifestFile)) {
|
| + RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
|
| +}
|
|
|
| NACL_BROWSER_TEST_F(NaClBrowserTest, Nameservice, {
|
| RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_nameservice_test.html"));
|
|
|