Enable NaCl glibc tests on ARM

chrome/test/nacl/nacl_browsertest_uma.cc

 // 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.
 
 #include "base/test/histogram_tester.h"
 #include "chrome/test/nacl/nacl_browsertest_util.h"
 #include "components/nacl/browser/nacl_browser.h"
 #include "components/nacl/renderer/platform_info.h"
 #include "components/nacl/renderer/ppb_nacl_private.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 178 matching lines @@
   base::HistogramTester histograms;
   // Hardcoded extension AppID that corresponds to the hardcoded
   // public key in the manifest.json file. We need to load the extension
   // nexe from the same origin, so we can't just try to load the extension
   // nexe as a mime-type handler from a non-extension URL.
   base::FilePath::StringType full_url =
       FILE_PATH_LITERAL("chrome-extension://cbcdidchbppangcjoddlpdjlenngjldk/")
       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
   //   - libstdc++.so.6
   //   - 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.
 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
                        ValidationCacheOfTranslatorNexes) {
   base::HistogramTester histograms;
   // Run a load test w/ one pexe cache identity.
   RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_0"));
 
   content::FetchHistogramsFromChildProcesses();
@@ skipping 24 matching lines @@
   // No extra cache settings.
   histograms.ExpectUniqueSample("NaCl.ValidationCache.Set",
                                 nacl::NaClBrowser::CACHE_HIT, 3);
 }
 
 
 // TODO(ncbray) convert the rest of nacl_uma.py (currently in the NaCl repo.)
 // Test validation failures and crashes.
 
 }  // namespace