Implement open_resource in non-SFI mode.

chrome/test/nacl/nacl_browsertest_util.h

Index: chrome/test/nacl/nacl_browsertest_util.h
diff --git a/chrome/test/nacl/nacl_browsertest_util.h b/chrome/test/nacl/nacl_browsertest_util.h
index 22fd852c9d5f25db7e0dff04cfb3a9f78ab158dd..976d22763edabd4f81e32789f2619465e14d670e 100644
--- a/chrome/test/nacl/nacl_browsertest_util.h
+++ b/chrome/test/nacl/nacl_browsertest_util.h
@@ -125,8 +125,8 @@ class NaClBrowserTestPnacl : public NaClBrowserTestBase {
 
 class NaClBrowserTestPnaclNonSfi : public NaClBrowserTestBase {
  public:
-  virtual base::FilePath::StringType Variant() OVERRIDE;
   virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual base::FilePath::StringType Variant() OVERRIDE;
 };
 
 // Class used to test that when --disable-pnacl is specified the PNaCl mime
@@ -164,6 +164,21 @@ class NaClBrowserTestStatic : public NaClBrowserTestBase {
 #define MAYBE_PNACL(test_name) test_name
 #endif
 
+// ASan does not work with libc-free context, so disable the test.
+#if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER)
+#  define MAYBE_NONSFI(test_case) test_case
+#else
+#  define MAYBE_NONSFI(test_case) DISABLED_##test_case
+#endif
+
+// Currently, translation from pexe to non-sfi nexe is supported only for
+// x86-32 binary.
+#if defined(OS_LINUX) && defined(ARCH_CPU_X86)
+#  define MAYBE_PNACL_NONSFI(test_case) test_case
+#else
+#  define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case
+#endif
+
 #if defined(ARCH_CPU_ARM_FAMILY) || defined(ARCH_CPU_MIPS_FAMILY)
 
 // There is no support for Glibc on ARM and MIPS NaCl.