Enable NaCl glibc tests on ARM

chrome/test/nacl/nacl_browsertest_uma.cc

Index: chrome/test/nacl/nacl_browsertest_uma.cc
diff --git a/chrome/test/nacl/nacl_browsertest_uma.cc b/chrome/test/nacl/nacl_browsertest_uma.cc
index 553198fec9f03b428feaf9edb628aa557980ae90..206e78aa868151410a4ee1d21b02623046a1a1b5 100644
--- a/chrome/test/nacl/nacl_browsertest_uma.cc
+++ b/chrome/test/nacl/nacl_browsertest_uma.cc
@@ -196,9 +196,11 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibcVcacheExtension,
       FILE_PATH_LITERAL("extension_validation_cache.html");
   RunNaClIntegrationTest(full_url, true);
 
-  // Should have received 9 validation queries, which respond with misses:
+  // Should have received 9 (or 10 on arm) validation queries, which respond
+  // with misses:
   //   - the IRT
   //   - ld.so (the initial nexe)
+  //   - elf_loader.nexe (arm only)
   //   - main.nexe
   //   - libppapi_cpp.so
   //   - libpthread.so.9b15f6a6
@@ -206,21 +208,33 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibcVcacheExtension,
   //   - libgcc_s.so.1
   //   - libc.so.9b15f6a6
   //   - libm.so.9b15f6a6
+#if defined(ARCH_CPU_ARM_FAMILY)
+  const int num_expected_binaries = 10;
+#else
+  const int num_expected_binaries = 9;
+#endif
+
   histograms.ExpectBucketCount("NaCl.ValidationCache.Query",
-                               nacl::NaClBrowser::CACHE_MISS, 9);
-  // TOTAL should then be 9 queries so far.
-  histograms.ExpectTotalCount("NaCl.ValidationCache.Query", 9);
+                               nacl::NaClBrowser::CACHE_MISS,
+                               num_expected_binaries);
+  // TOTAL should then be N queries so far.
+  histograms.ExpectTotalCount("NaCl.ValidationCache.Query",
+                              num_expected_binaries);
   // Should have received a cache setting afterwards for IRT and nexe.
   histograms.ExpectBucketCount("NaCl.ValidationCache.Set",
-                               nacl::NaClBrowser::CACHE_HIT, 9);
+                               nacl::NaClBrowser::CACHE_HIT,
+                               num_expected_binaries);
 
   // Load it again to hit the cache.
   RunNaClIntegrationTest(full_url, true);
-  // Should have received 9 more validation queries and responded with hits.
+  // Should have received N more validation queries and responded with hits.
   histograms.ExpectBucketCount("NaCl.ValidationCache.Query",
-                               nacl::NaClBrowser::CACHE_HIT, 9);
-  histograms.ExpectTotalCount("NaCl.ValidationCache.Query", 18);
-  histograms.ExpectTotalCount("NaCl.ValidationCache.Set", 9);
+                               nacl::NaClBrowser::CACHE_HIT,
+                               num_expected_binaries);
+  histograms.ExpectTotalCount("NaCl.ValidationCache.Query",
+                              2 * num_expected_binaries);
+  histograms.ExpectTotalCount("NaCl.ValidationCache.Set",
+                              num_expected_binaries);
 }
 
 // Test that validation for the 2 PNaCl translator nexes can be cached.