Enable NaCl glibc tests on ARM

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 155 matching lines @@
 
 // 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
 
-// NaCl glibc tests are included for x86 only, as there is no glibc support
-// for other architectures (ARM/MIPS).
-#if defined(ARCH_CPU_X86_FAMILY) && \
-    !defined(DISABLE_NACL_BROWSERTESTS)
+// NaCl glibc toolchain is not available on MIPS
+#if defined(ARCH_CPU_MIPS_FAMILY) || defined(DISABLE_NACL_BROWSERTESTS)
+#  define MAYBE_GLIBC(test_name) DISABLED_##test_name
+#else
 #  define MAYBE_GLIBC(test_name) test_name
-#else
-#  define MAYBE_GLIBC(test_name) DISABLED_##test_name
 #endif
 
 // Currently, we only support it on x86-32 or ARM architecture.
 // TODO(hidehiko,mazda): Enable this on x86-64, too, when it is supported.
 #if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER) && \
     !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) && \
     !defined(LEAK_SANITIZER) && \
     (defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARMEL))
 #  define MAYBE_NONSFI(test_case) test_case
 #else
@@ skipping 13 matching lines @@
 
 #define NACL_BROWSER_TEST_F(suite, name, body) \
 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \
 body \
 IN_PROC_BROWSER_TEST_F(suite##GLibc, MAYBE_GLIBC(name)) \
 body \
 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \
 body
 
 #endif  // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_