| Index: chrome/test/nacl/nacl_browsertest.cc
|
| diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
|
| index bfacf17e206eb55b865b748efb3befe6ed9cb220..35c43de63e81116328fca73982d4c8820b60a94b 100644
|
| --- a/chrome/test/nacl/nacl_browsertest.cc
|
| +++ b/chrome/test/nacl/nacl_browsertest.cc
|
| @@ -142,11 +142,11 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashViaCheckFailure, {
|
| })
|
|
|
| NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashViaExitCall, {
|
| - RunNaClIntegrationTest( FILE_PATH_LITERAL("ppapi_crash_via_exit_call.html"));
|
| + RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash_via_exit_call.html"));
|
| })
|
|
|
| NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashInCallback, {
|
| - RunNaClIntegrationTest( FILE_PATH_LITERAL("ppapi_crash_in_callback.html"));
|
| + RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash_in_callback.html"));
|
| })
|
|
|
| NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_CrashOffMainThread, {
|
| @@ -386,6 +386,13 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
|
| RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_0"));
|
| }
|
|
|
| +// Test Subzero. Subzero is triggered by the O0 option so reuse that test
|
| +// pexe and test harness.
|
| +IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclSubzero,
|
| + MAYBE_PNACL(PnaclNMFOptionsO0)) {
|
| + RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_0"));
|
| +}
|
| +
|
| IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
|
| MAYBE_PNACL(PnaclNMFOptionsO2)) {
|
| RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_2"));
|
|
|