Refactor the process of choosing validators.

src/trusted/service_runtime/sel_ldr.h

 /*
  * 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.
  */
 
 /*
  * NaCl Simple/secure ELF loader (NaCl SEL).
  *
  * This loader can only process NaCl object files as produced using
@@ skipping 35 matching lines @@
 #include "native_client/src/trusted/service_runtime/nacl_kern_services.h"
 #include "native_client/src/trusted/service_runtime/nacl_resource.h"
 
 #include "native_client/src/trusted/service_runtime/sel_mem.h"
 #include "native_client/src/trusted/service_runtime/sel_util.h"
 #include "native_client/src/trusted/service_runtime/sel_rt.h"
 
 #include "native_client/src/trusted/service_runtime/name_service/name_service.h"
 
 #include "native_client/src/trusted/validator/cpufeatures.h"
+#include "native_client/src/trusted/validator/ncvalidate.h"
 
 EXTERN_C_BEGIN
 
 #define NACL_SERVICE_PORT_DESCRIPTOR    3
 #define NACL_SERVICE_ADDRESS_DESCRIPTOR 4
 
 #define NACL_DEFAULT_STACK_MAX  (16 << 20)  /* main thread stack */
 
 #define NACL_SANDBOX_CHROOT_FD  "SBX_D"
 
@@ skipping 293 matching lines @@
 
   int                       enable_debug_stub;
   const struct NaClDebugCallbacks *debug_stub_callbacks;
   struct NaClMutex          exception_mu;
   uint32_t                  exception_handler;
   int                       enable_exception_handling;
 #if NACL_WINDOWS
   enum NaClDebugExceptionHandlerState debug_exception_handler_state;
   NaClAttachDebugExceptionHandlerFunc attach_debug_exception_handler_func;
 #endif
-  int                       enable_dfa_validator;
+  const struct NaClValidatorInterface *validator;
 };
 
 
 
 void  NaClAppIncrVerbosity(void);
 
 /*
  * Initializes a NaCl application with the default parameters
  * and the specified syscall table.
  *
@@ skipping 392 matching lines @@
 void NaClUntrustedThreadsSuspendAll(struct NaClApp *nap, int save_registers);
 void NaClUntrustedThreadsResumeAll(struct NaClApp *nap);
 
 #if NACL_LINUX
 void handle_r_debug(const char *switch_value, char *argv0);
 #endif
 
 EXTERN_C_END
 
 #endif  /* NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_SEL_LDR_H_ */