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)
@@ -30,9 +30,15 @@
   { 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] */
 #ifdef IRT_PPAPI
   { NACL_IRT_PPAPIHOOK_v0_1, &nacl_irt_ppapihook, sizeof(nacl_irt_ppapihook) },
+/* Enable this once we have migrated the shimminh to the chrome tree. */
+#if 0
+  { 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,
@@ -41,8 +47,7 @@
 
 size_t nacl_irt_interface(const char *interface_ident,
                           void *table, size_t tablesize) {
-  int i;
-  for (i = 0; i < NACL_ARRAY_SIZE(irt_interfaces); ++i) {
+  for (int i = 0; i < NACL_ARRAY_SIZE(irt_interfaces); ++i) {

[Mark Seaborn, 2012/08/28 18:57:07]

The formatting change to this function is unnecessary, so please undo it.

[Robert Muth (chromium), 2012/08/28 20:22:46]

Done.

     if (0 == strcmp(interface_ident, irt_interfaces[i].name)) {
       const size_t size = irt_interfaces[i].size;
       if (size <= tablesize) {