Incorporate shimming into the irt

src/untrusted/irt/irt_interfaces.c

Index: src/untrusted/irt/irt_interfaces.c
===================================================================
--- src/untrusted/irt/irt_interfaces.c	(revision 9574)
+++ src/untrusted/irt/irt_interfaces.c	(working copy)
@@ -8,6 +8,7 @@
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/untrusted/irt/irt.h"
+#include "native_client/src/untrusted/irt/irt_shim.h"
 #include "native_client/src/untrusted/irt/irt_interfaces.h"
 
 struct nacl_interface_table {
@@ -30,9 +31,16 @@
   { NACL_IRT_BLOCKHOOK_v0_1, &nacl_irt_blockhook, sizeof(nacl_irt_blockhook) },
   { NACL_IRT_RESOURCE_OPEN_v0_1, &nacl_irt_resource_open,
       sizeof(nacl_irt_resource_open) },
+/* @IGNORE_LINES_FOR_CODE_HYGIENE[1] */

[Mark Seaborn, 2012/08/28 20:41:00]

Please indent by 2 spaces to match the surrounding code

[Mark Seaborn, 2012/08/28 21:32:00]

Ping?

Please do this for the comment below too.

 #ifdef IRT_PPAPI
   { NACL_IRT_PPAPIHOOK_v0_1, &nacl_irt_ppapihook, sizeof(nacl_irt_ppapihook) },
+/* This ifdef should be removed once the IRT build has migrated to the Chrome tree. */

[Mark Seaborn, 2012/08/28 20:41:00]

Please add a TODO(robertm) in this comment.  Also, this line is >80 chars long. 
Also, the comment would be more accurate if it said "once Chromium's Gyp build
has been extended to build the shims".

+/* @IGNORE_LINES_FOR_CODE_HYGIENE[1] */
+#ifdef ENABLE_NACL_IRT_PPAPIHOOK_SHIMMED
+  { NACL_IRT_PPAPIHOOK_SHIMMED_v0_1, &nacl_irt_ppapihook_shimmed,
+    sizeof(nacl_irt_ppapihook) },
 #endif
+#endif
   { NACL_IRT_RANDOM_v0_1, &nacl_irt_random, sizeof(nacl_irt_random) },
   { NACL_IRT_CLOCK_v0_1, &nacl_irt_clock, sizeof(nacl_irt_clock) },
   { NACL_IRT_DEV_EXCEPTION_HANDLING_v0_1, &nacl_irt_dev_exception_handling,