Enable transitional non-SFI browser tests on ARM

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 289a339e83add37f6a60b77514a4989c82a7e79d..c4080abbedca752e9f5c9e9c8e78e517b4e61b0d 100644
--- a/chrome/test/nacl/nacl_browsertest_util.h
+++ b/chrome/test/nacl/nacl_browsertest_util.h
@@ -200,11 +200,11 @@ class NaClBrowserTestGLibcExtension : public NaClBrowserTestGLibc {
 #  define MAYBE_NONSFI(test_case) DISABLED_##test_case
 #endif
 
-// Currently, we only support it on x86-32 architecture.
-// TODO(hidehiko,mazda): Enable this on ARM, too, when it is supported.
+// Currently, we only support it on x86-32 or ARM architecture.
 #if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER) && \
     !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) && \
-  !defined(LEAK_SANITIZER) && defined(ARCH_CPU_X86)
+    !defined(LEAK_SANITIZER) && \
+    (defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARMEL))
 #  define MAYBE_TRANSITIONAL_NONSFI(test_case) test_case
 #else
 #  define MAYBE_TRANSITIONAL_NONSFI(test_case) DISABLED_##test_case
@@ -218,16 +218,6 @@ class NaClBrowserTestGLibcExtension : public NaClBrowserTestGLibc {
 #  define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case
 #endif
 
-// Similar to MAYBE_NACL_HELPER_NONSFI, this is not available on ARM yet.
-// TODO(hidehiko,mazda): Merge this to the MAYBE_PNACL_NONSFI when it is
-// supported on ARM.
-#if defined(OS_LINUX) && defined(ARCH_CPU_X86)
-#  define MAYBE_PNACL_TRANSITIONAL_NONSFI(test_case) test_case
-#else
-#  define MAYBE_PNACL_TRANSITIONAL_NONSFI(test_case) DISABLED_##test_case
-#endif
-
-
 #define NACL_BROWSER_TEST_F(suite, name, body) \
 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \
 body \