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

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

Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.h
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.h b/ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.h
new file mode 100644
index 0000000000000000000000000000000000000000..6c1c212e6e817afac65f62d18e7c49ea2bab7bbb
--- /dev/null
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2014 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.
+ */
+
+#ifndef PPAPI_NATIVE_CLIENT_SRC_UNTRUSTED_PNACL_IRT_SHIM_IRT_SHIM_PPAPI_H_
+#define PPAPI_NATIVE_CLIENT_SRC_UNTRUSTED_PNACL_IRT_SHIM_IRT_SHIM_PPAPI_H_
+
+#include "ppapi/nacl_irt/irt_ppapi.h"
+
+#ifdef PNACL_SHIM_AOT
+/* Given a hook for the real irt ppapi start, get a shimmed ppapi_start. */
+extern int (*real_irt_ppapi_start)(const struct PP_StartFunctions *);
+extern int irt_shim_ppapi_start(const struct PP_StartFunctions *funcs);
+#else

[Mark Seaborn, 2014/02/27 17:24:07]

Nit: add empty lines around #else/#ifdef/#endif for readability?

[jvoung (off chromium), 2014/02/27 21:55:45]

Done.

+/*
+ * A private version of the NACL_IRT_PPAPIHOOK_v0_1, which provides
+ * PNaCl with shimmed IRT interfaces.
+ */
+#define NACL_IRT_PPAPIHOOK_PNACL_PRIVATE_v0_1   \
+  "nacl-irt-ppapihook-pnacl-private-0.1"
+extern const struct nacl_irt_ppapihook nacl_irt_ppapihook_pnacl_private;
+#endif
+
+#endif