| Index: chrome/test/nacl/nacl_browsertest.cc
|
| diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
|
| index 299e334a3c59811e273fe9ce204313e157a524f6..605fdebd8d83c875459602614e0aa88c76bdabb3 100644
|
| --- a/chrome/test/nacl/nacl_browsertest.cc
|
| +++ b/chrome/test/nacl/nacl_browsertest.cc
|
| @@ -42,10 +42,20 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Messaging)) {
|
| RunLoadTest(FILE_PATH_LITERAL("libc_free.html"));
|
| }
|
|
|
| +IN_PROC_BROWSER_TEST_F(NaClBrowserTestTransitionalNonSfi,
|
| + MAYBE_TRANSITIONAL_NONSFI(Messaging)) {
|
| + RunLoadTest(FILE_PATH_LITERAL("libc_free.html"));
|
| +}
|
| +
|
| IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Irt)) {
|
| RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html"));
|
| }
|
|
|
| +IN_PROC_BROWSER_TEST_F(NaClBrowserTestTransitionalNonSfi,
|
| + MAYBE_TRANSITIONAL_NONSFI(Irt)) {
|
| + RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html"));
|
| +}
|
| +
|
| NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus0, {
|
| RunNaClIntegrationTest(FILE_PATH_LITERAL(
|
| "pm_exit_status_test.html?trigger=exit0&expected_exit=0"));
|
| @@ -154,6 +164,10 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
|
| MAYBE_PNACL_NONSFI(IrtManifestFile)) {
|
| RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
|
| }
|
| +IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclTransitionalNonSfi,
|
| + MAYBE_PNACL_TRANSITIONAL_NONSFI(IrtManifestFile)) {
|
| + RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
|
| +}
|
|
|
| #if defined(OS_WIN)
|
| // http://crbug.com/416272
|
| @@ -168,6 +182,10 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
|
| MAYBE_PNACL_NONSFI(IrtException)) {
|
| RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
|
| }
|
| +IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclTransitionalNonSfi,
|
| + MAYBE_PNACL_TRANSITIONAL_NONSFI(IrtException)) {
|
| + RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
|
| +}
|
|
|
| // Some versions of Visual Studio does not like preprocessor
|
| // conditionals inside the argument of a macro, so we put the
|
|
|