NonSFI NaCl: Plumb Exception IRT enough for breakpad.

chrome/test/nacl/nacl_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 #if defined(OS_POSIX)
 #include <unistd.h>
 #elif defined(OS_WIN)
 #include <windows.h>
 #endif
@@ skipping 125 matching lines @@
   RunNaClIntegrationTest(FILE_PATH_LITERAL(
       "pm_pre_init_manifest_file_test.html"));
 }
 IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, PreInitManifestFile) {
   RunNaClIntegrationTest(FILE_PATH_LITERAL(
       "pm_pre_init_manifest_file_test.html"));
 }
 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) {
   RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
 }
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtException) {
+  RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
+}
 
 NACL_BROWSER_TEST_F(NaClBrowserTest, Nameservice, {
   RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_nameservice_test.html"));
 })
 
 // Some versions of Visual Studio does not like preprocessor
 // conditionals inside the argument of a macro, so we put the
 // conditionals on a helper function.  We are already in an anonymous
 // namespace, so the name of the helper is not visible in external
 // scope.
@@ skipping 214 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, PnaclMimeType) {
   RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDisabled, PnaclMimeType) {
   RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.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)) {

[Mark Seaborn, 2014/04/24 23:39:28]

Can you put the two IrtException test decls next to each other, for clarity,
please?

[Junichi Uekawa, 2014/04/25 01:06:10]

Done.

+  RunNaClIntegrationTest(FILE_PATH_LITERAL(
+      "irt_exception_test.html"));

[Mark Seaborn, 2014/04/24 23:39:28]

Nit: fits on previous line?

[Junichi Uekawa, 2014/04/25 01:06:10]

Done.

+}
+
 class NaClBrowserTestNewlibStdoutPM : public NaClBrowserTestNewlib {
  public:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     // Env needs to be set early because nacl_helper is spawned before the test
     // body on Linux.
     scoped_ptr<base::Environment> env(base::Environment::Create());
     env->SetVar("NACL_EXE_STDOUT", "DEBUG_ONLY:dev://postmessage");
     NaClBrowserTestNewlib::SetUpInProcessBrowserTestFixture();
   }
 };
@@ skipping 65 matching lines @@
   }
 };
 
 // TODO(ncbray) support glibc and PNaCl
 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MimeHandler) {
   RunNaClIntegrationTest(FILE_PATH_LITERAL(
       "ppapi_extension_mime_handler.html"));
 }
 
 }  // namespace