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)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 The Native Client Authors. All rights reserved.
+ * Copyright 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.
  */
@@ -30,9 +30,14 @@
   { 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) },
+#ifdef DISABLED_WHILE_IN_TRANSITION_TO_CHROME_TREE

[Mark Seaborn, 2012/08/28 15:51:20]

Why is this #ifdef here?  No-one defines this symbol.  Plus it looks like this
is the wrong way around and should be an #ifndef.  Please remove the #ifdef.

[Robert Muth (chromium), 2012/08/28 18:13:30]

commented this out for now using "#if 0"
and added a comment
On 2012/08/28 15:51:20, Mark Seaborn wrote:

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

Doing "#if 0" rather defeats the purpose of the change.  Brad N has since
explained to me that he wanted an #ifdef so that this change doesn't break the
Chromium build (so that we can commit the Chromium-side Gyp changes later).

So please put an #ifdef in, but you will need to actually define the symbol the
#ifdef references somewhere in the Scons build.

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

Done.

+  { 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,
@@ -40,9 +45,9 @@
 };
 
 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) {
+                          void *table,

[Mark Seaborn, 2012/08/28 15:51:20]

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

[Robert Muth (chromium), 2012/08/28 18:13:30]

Done.

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