Incorporate shimming into the irt

src/untrusted/irt/irt.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.
  */
 #ifndef NATIVE_CLIENT_SRC_UNTRUSTED_IRT_IRT_H_
 #define NATIVE_CLIENT_SRC_UNTRUSTED_IRT_IRT_H_
 
 #include <stddef.h>
 #include <sys/types.h>
@@ skipping 128 matching lines @@
 struct nacl_irt_tls {
   int (*tls_init)(void *thread_ptr);
   void *(*tls_get)(void);
 };
 
 #define NACL_IRT_BLOCKHOOK_v0_1 "nacl-irt-blockhook-0.1"
 struct nacl_irt_blockhook {
   int (*register_block_hooks)(void (*pre)(void), void (*post)(void));
 };
 
+/* These should be kept in sync, both are using the nacl_irt_ppapihook API. */
 #define NACL_IRT_PPAPIHOOK_v0_1 "nacl-irt-ppapihook-0.1"
+#define NACL_IRT_PPAPIHOOK_SHIMMED_v0_1 "nacl-irt-ppapihook-shimmed-0.1"
 struct nacl_irt_ppapihook {
   int (*ppapi_start)(const struct PP_StartFunctions *);
   void (*ppapi_register_thread_creator)(const struct PP_ThreadFunctions *);
 };
 
 #define NACL_IRT_RESOURCE_OPEN_v0_1 "nacl-irt-resource-open-0.1"
 struct nacl_irt_resource_open {
   int (*open_resource)(const char *file, int *fd);
 };
 
@@ skipping 20 matching lines @@
                            NaClExceptionHandler *old_handler);
   int (*exception_stack)(void *stack, size_t size);
   int (*exception_clear_flag)(void);
 };
 
 #if defined(__cplusplus)
 }
 #endif
 
 #endif /* NATIVE_CLIENT_SRC_UNTRUSTED_IRT_IRT_H */