Refactor the process of choosing validators.

src/trusted/validator/validation_cache_test.cc

 /*
  * Copyright (c) 2012 The Native Client 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 "gtest/gtest.h"
 
 #include "native_client/src/include/nacl_compiler_annotations.h"
 #include "native_client/src/shared/platform/nacl_log.h"
+#include "native_client/src/shared/utils/types.h"
 #include "native_client/src/trusted/validator/ncvalidate.h"
 #include "native_client/src/trusted/validator/validation_cache.h"
 
 #define CONTEXT_MARKER 31
 #define QUERY_MARKER 37
 
 #define CODE_SIZE 32
 
 // ret
 const char ret[CODE_SIZE + 1] =
@@ skipping 99 matching lines @@
     cache.QueryKnownToValidate = MockQueryCodeValidates;
     cache.SetKnownToValidate = MockSetCodeValidates;
     cache.DestroyQuery = MockDestroyQuery;
 
     NaClSetAllCPUFeatures(&cpu_features);
 
     memset(code_buffer, 0x90, sizeof(code_buffer));
   }
 
   NaClValidationStatus Validate() {
-    return NACL_SUBARCH_NAME(ApplyValidator,
-                             NACL_TARGET_ARCH,
-                             NACL_TARGET_SUBARCH)(
-                                 0, code_buffer, 32,
-                                 /* stubout_mode= */ FALSE,
-                                 /* readonly_test= */ FALSE, &cpu_features,
-                                 &cache);
+    const struct NaClValidatorInterface *validator = NaClCreateValidator();
+    return validator->Validate(0, code_buffer, 32,
+                               FALSE,  /* stubout_mode= */
+                               FALSE,  /* readonly_test= */
+                               &cpu_features,
+                               &cache);
   }
 };
 
 TEST_F(ValidationCachingInterfaceTests, Sanity) {
   void *query = cache.CreateQuery(cache.handle);
   cache.AddData(query, NULL, 6);
   cache.AddData(query, NULL, 128);
   EXPECT_EQ(1, cache.QueryKnownToValidate(query));
   cache.DestroyQuery(query);
   EXPECT_EQ(true, context.query_destroyed);
 }
 
 TEST_F(ValidationCachingInterfaceTests, NoCache) {
-  NaClValidationStatus status =
-      NACL_SUBARCH_NAME(ApplyValidator,
-                        NACL_TARGET_ARCH,
-                        NACL_TARGET_SUBARCH)(
-                            0, code_buffer, CODE_SIZE,
-                            /* stubout_mode= */ FALSE,
-                            /* readonly_test= */ FALSE, &cpu_features,
-                            NULL);
+  const struct NaClValidatorInterface *validator = NaClCreateValidator();
+  NaClValidationStatus status = validator->Validate(
+      0, code_buffer, CODE_SIZE,
+      FALSE, /* stubout_mode */
+      FALSE, /* readonly_test */
+      &cpu_features,
+      NULL);
   EXPECT_EQ(NaClValidationSucceeded, status);
 }
 
 TEST_F(ValidationCachingInterfaceTests, CacheHit) {
   NaClValidationStatus status = Validate();
   EXPECT_EQ(NaClValidationSucceeded, status);
   EXPECT_EQ(true, context.query_destroyed);
 }
 
 TEST_F(ValidationCachingInterfaceTests, CacheMiss) {
@@ skipping 41 matching lines @@
 // Test driver function.
 int main(int argc, char *argv[]) {
   // The IllegalInst test touches the log mutex deep inside the validator.
   // This causes an SEH exception to be thrown on Windows if the mutex is not
   // initialized.
   // http://code.google.com/p/nativeclient/issues/detail?id=1696
   NaClLogModuleInit();
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }