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

chrome/nacl.gypi

 # Copyright (c) 2011 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.
 
 {
   'target_defaults': {
     'variables': {
       'nacl_target': 0,
     },
     'target_conditions': [
@@ skipping 55 matching lines @@
             'python build_nacl_irt.py --inputs',
       },
       'dependencies': [
         # TODO(gregoryd): chrome_resources and chrome_strings could be
         # shared with the 64-bit target, but it does not work due to a gyp
         #issue
         'chrome_resources',
         'chrome_strings',
         'common',
         '../webkit/support/webkit_support.gyp:glue',
-        '../native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome',
+        '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome',
         '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
         '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
       ],
       'direct_dependent_settings': {
         'defines': [
           'NACL_BLOCK_SHIFT=5',
           'NACL_BLOCK_SIZE=32',
           '<@(nacl_defines)',
         ],
       },
@@ skipping 143 matching lines @@
                         # reference nacl_helper as a shared library
                         '<(PRODUCT_DIR)/nacl_helper.so',
                         '-Wl,-rpath,<(SHARED_LIB_DIR)',
                       ],
           },
         },
       ],
     }],
   ],
 }