Implement open_resource in non-SFI mode.

chrome/test/nacl/nacl_browsertest_util.h

 // 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.
 
 #ifndef CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_
 #define CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 105 matching lines @@
   virtual base::FilePath::StringType Variant() OVERRIDE;
 };
 
 class NaClBrowserTestPnacl : public NaClBrowserTestBase {
  public:
   virtual base::FilePath::StringType Variant() OVERRIDE;
 
   virtual bool IsAPnaclTest() OVERRIDE;
 };
 
-class NaClBrowserTestPnaclNonSfi : public NaClBrowserTestBase {
- public:
-  virtual base::FilePath::StringType Variant() OVERRIDE;
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
-};
-
 // Class used to test that when --disable-pnacl is specified the PNaCl mime
 // type is not available.
 class NaClBrowserTestPnaclDisabled : public NaClBrowserTestBase {
  public:
   virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
 
   virtual base::FilePath::StringType Variant() OVERRIDE;
 
   virtual bool IsAPnaclTest() OVERRIDE;
 
   virtual bool IsPnaclDisabled() OVERRIDE;
 };
 
 class NaClBrowserTestNonSfiMode : public NaClBrowserTestBase {
  public:
   virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
   virtual base::FilePath::StringType Variant() OVERRIDE;
 };
 
+class NaClBrowserTestPnaclNonSfi : public NaClBrowserTestBase {

[Mark Seaborn, 2014/05/01 23:28:33]

No need to move this declaration.

[hidehiko, 2014/05/02 01:32:27]

Oh, reverted.

+ public:
+  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual base::FilePath::StringType Variant() OVERRIDE;
+};
+
 // A NaCl browser test only using static files.
 class NaClBrowserTestStatic : public NaClBrowserTestBase {
  public:
   virtual base::FilePath::StringType Variant() OVERRIDE;
   virtual bool GetDocumentRoot(base::FilePath* document_root) OVERRIDE;
 };
 
 // PNaCl tests take a long time on windows debug builds
 // and sometimes time out.  Disable until it is made faster:
 // https://code.google.com/p/chromium/issues/detail?id=177555
 #if (defined(OS_WIN) && !defined(NDEBUG))
 #define MAYBE_PNACL(test_name) DISABLED_##test_name
 #else
 #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.
 #define NACL_BROWSER_TEST_F(suite, name, body) \
 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \
 body \
 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \
 body
 
 #else
 
 // Otherwise, we have Glibc, Newlib and Pnacl tests
 #define NACL_BROWSER_TEST_F(suite, name, body) \
 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \
 body \
 IN_PROC_BROWSER_TEST_F(suite##GLibc, name) \
 body \
 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \
 body
 
 #endif
 
 #endif  // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_