Pulling new nacl into chrome, which now uses a single ppapi copy.

chrome/build_nacl_irt.py

Index: chrome/build_nacl_irt.py
===================================================================
--- chrome/build_nacl_irt.py	(revision 98186)
+++ chrome/build_nacl_irt.py	(working copy)
@@ -21,7 +21,10 @@
                                    'ppapi_proxy', 'command_buffer')
 GPU_CMD_BUFFER_DIR = os.path.join('..', 'gpu', 'command_buffer')
 
+# Pathing to mirror of nacl tree in ppapi.
+PPAPI_NACL_DIR = os.path.join(SRC_DIR, 'ppapi', 'native_client')
 
+
 def RelativePath(path, base):
   """Find the relative path.
 
@@ -94,6 +97,10 @@
       # Apply the underlay of gpu/command_buffer (to match scons).
       if filename.startswith(NACL_CMD_BUFFER_DIR + os.sep):
         filename = GPU_CMD_BUFFER_DIR + filename[len(NACL_CMD_BUFFER_DIR):]
+      # Apply the underlay of ppapi (to match scons).
+      if (not os.path.exists(os.path.join(NACL_DIR, filename)) and
+          os.path.exists(os.path.join(PPAPI_NACL_DIR, filename))):
+        filename = '../ppapi/native_client/' + filename
       inputs.add(filename)
   # Check that everything exists and make it script relative.
   # Exclude things above SRC_DIR.