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

Unified Diff: chrome/test/nacl/nacl_browsertest.cc

Issue 724323002: Non-SFI mode: Enable browser_tests for nacl_helper_nonsfi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/nacl/nacl_browsertest_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/nacl/nacl_browsertest_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698