Revert 266968 "NonSFI NaCl: Plumb Exception IRT enough for break..."

trunk/src/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 126 matching lines @@
       "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"));
 }
 
-// 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(NaClBrowserTestNewlib, IrtException) {
-  RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
-}
-IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
-                       MAYBE_NONSFI(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.
 #if defined(OS_POSIX)
@@ skipping 298 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