NonSFI NaCl: Plumb Exception IRT enough for breakpad.

chrome/test/nacl/nacl_browsertest.cc

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..cf27ec2972e57a8328b493f8fbb02c39063e0bd2 100644
--- a/chrome/test/nacl/nacl_browsertest.cc
+++ b/chrome/test/nacl/nacl_browsertest.cc
@@ -144,6 +144,22 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) {
   RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
 }
 
+// The NonSFI test is currently available only on linux-x86-32
+// architecture.
+#if defined(OS_LINUX) && defined(ARCH_CPU_X86)
+#define MAYBE_NONSFI(test_name) test_name
+#else
+#define MAYBE_NONSFI(test_name) DISABLED_##test_name
+#endif
+
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
+                       MAYBE_NONSFI(IrtException)) {
+  RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
+}
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtException) {

[Mark Seaborn, 2014/04/25 15:42:02]

Nit: can you swap these two so that NaClBrowserTestNewlib is first, just to
follow the usual ordering?

[Junichi Uekawa, 2014/04/25 22:13:53]

Done.

+  RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
+}
+
 NACL_BROWSER_TEST_F(NaClBrowserTest, Nameservice, {
   RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_nameservice_test.html"));
 })