Split the PNaCl IRT shim into 3 pieces, and include one piece into IRT.

ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.h

Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.h
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.h b/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.h
index d5b7e32d85c88848a9774674697e4c9ef83b9bf7..6231196996b35b7bc303b381ae54e42aa0d4f70d 100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.h
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_ppapi.h
@@ -4,8 +4,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef NATIVE_CLIENT_SRC_UNTRUSTED_PNACL_IRT_SHIM_SHIM_PPAPI_H_
-#define NATIVE_CLIENT_SRC_UNTRUSTED_PNACL_IRT_SHIM_SHIM_PPAPI_H_ 1
+#ifndef PPAPI_NATIVE_CLIENT_SRC_UNTRUSTED_PNACL_IRT_SHIM_SHIM_PPAPI_H_
+#define PPAPI_NATIVE_CLIENT_SRC_UNTRUSTED_PNACL_IRT_SHIM_SHIM_PPAPI_H_ 1
 
 #include <stddef.h>
 #include "native_client/src/untrusted/irt/irt.h"
@@ -13,9 +13,12 @@
 /*
  * Remembers the IRT's true interface query function.
  */
-extern TYPE_nacl_irt_query __pnacl_real_irt_interface;
+extern TYPE_nacl_irt_query __pnacl_real_irt_query_func;
 
-size_t __pnacl_irt_interface_wrapper(const char *interface_ident,
-                                     void *table, size_t tablesize);
+/*
+ * Provides a wrapped query function.
+ */
+size_t __pnacl_wrap_irt_query_func(const char *interface_ident,
+                                   void *table, size_t tablesize);
 
-#endif  /* NATIVE_CLIENT_SRC_UNTRUSTED_PNACL_IRT_SHIM_SHIM_PPAPI_H_ */
+#endif  /* PPAPI_NATIVE_CLIENT_SRC_UNTRUSTED_PNACL_IRT_SHIM_SHIM_PPAPI_H_ */